Changeset 33941 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

Timestamp:

May 20, 2008, 1:59:16 PM (17 years ago)

Author:

[email protected]

Message:

2008-05-20 Kevin McCullough <​[email protected]>

Reviewed by Tim.

<rdar://problem/5770054> JavaScript profiler (10928)
Split function name into 3 parts so that the Web Inspector can link it to
the resource location from whence it came.

• kjs/ustring.cpp: Implemented operator> for UStrings (KJS::operator>):
• kjs/ustring.h:
• profiler/Profile.cpp: (KJS::Profile::Profile): Initialize all 3 values. (KJS::Profile::willExecute): Use CallIdentifier struct. (KJS::Profile::didExecute): Ditto.
• profiler/Profile.h: Ditto and remove unused function.
• profiler/ProfileNode.cpp: (KJS::ProfileNode::ProfileNode): Use CallIdentifier struct. (KJS::ProfileNode::willExecute): Ditto and fix an issue where we restarted the m_startTime even though it was already started. (KJS::ProfileNode::didExecute): Ditto. (KJS::ProfileNode::findChild): Ditto. (KJS::functionNameDescendingComparator): Ditto and use new comparator. (KJS::functionNameAscendingComparator): Ditto. (KJS::ProfileNode::printDataInspectorStyle): Use CallIdentifier struct. (KJS::ProfileNode::printDataSampleStyle): Ditto.
• profiler/ProfileNode.h: (KJS::CallIdentifier::CallIdentifier): Describe the CallIdentifier struct (KJS::CallIdentifier::operator== ): (KJS::ProfileNode::create): Use the CallIdentifier struct. (KJS::ProfileNode::callIdentifier): (KJS::ProfileNode::functionName): Now only return the function name, not the url and line number too. (KJS::ProfileNode::url): (KJS::ProfileNode::lineNumber):
• profiler/Profiler.cpp: Use the CallIdentifier struct. (KJS::Profiler::startProfiling): (KJS::Profiler::willExecute): (KJS::Profiler::didExecute): (KJS::getCallIdentifiers): (KJS::getCallIdentifierFromFunctionImp):

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -1274 +1274 @@
 }
 
-int compare(const UString& s1, const UString& s2)
+bool operator>(const UString& s1, const UString& s2)
 {
   const int l1 = s1.size();
@@ -1287 +1287 @@
     l++;
   }
+  if (l < lmin)
+    return (c1[0] > c2[0]);
+
+  return (l1 > l2);
+}
+
+int compare(const UString& s1, const UString& s2)
+{
+  const int l1 = s1.size();
+  const int l2 = s2.size();
+  const int lmin = l1 < l2 ? l1 : l2;
+  const UChar *c1 = s1.data();
+  const UChar *c2 = s2.data();
+  int l = 0;
+  while (l < lmin && *c1 == *c2) {
+    c1++;
+    c2++;
+    l++;
+  }
 
   if (l < lmin)