From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 10 Sep 2012 19:10:20 +0200 Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073) New snapshot --- Source/JavaScriptCore/profiler/ProfileNode.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/JavaScriptCore/profiler/ProfileNode.h') diff --git a/Source/JavaScriptCore/profiler/ProfileNode.h b/Source/JavaScriptCore/profiler/ProfileNode.h index ffe7b6f9d..26000a827 100644 --- a/Source/JavaScriptCore/profiler/ProfileNode.h +++ b/Source/JavaScriptCore/profiler/ProfileNode.h @@ -64,8 +64,8 @@ namespace JSC { // CallIdentifier members ExecState* callerCallFrame() const { return m_callerCallFrame; } const CallIdentifier& callIdentifier() const { return m_callIdentifier; } - const UString& functionName() const { return m_callIdentifier.m_name; } - const UString& url() const { return m_callIdentifier.m_url; } + const String& functionName() const { return m_callIdentifier.m_name; } + const String& url() const { return m_callIdentifier.m_url; } unsigned lineNumber() const { return m_callIdentifier.m_lineNumber; } // Relationships @@ -146,8 +146,8 @@ namespace JSC { static inline bool selfTimeAscendingComparator(const RefPtr& a, const RefPtr& b) { return a->selfTime() < b->selfTime(); } static inline bool callsDescendingComparator(const RefPtr& a, const RefPtr& b) { return a->numberOfCalls() > b->numberOfCalls(); } static inline bool callsAscendingComparator(const RefPtr& a, const RefPtr& b) { return a->numberOfCalls() < b->numberOfCalls(); } - static inline bool functionNameDescendingComparator(const RefPtr& a, const RefPtr& b) { return a->functionName() > b->functionName(); } - static inline bool functionNameAscendingComparator(const RefPtr& a, const RefPtr& b) { return a->functionName() < b->functionName(); } + static inline bool functionNameDescendingComparator(const RefPtr& a, const RefPtr& b) { return codePointCompareLessThan(b->functionName(), a->functionName()); } + static inline bool functionNameAscendingComparator(const RefPtr& a, const RefPtr& b) { return codePointCompareLessThan(a->functionName(), b->functionName()); } ExecState* m_callerCallFrame; CallIdentifier m_callIdentifier; -- cgit v1.2.1