diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
| commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
| tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/JavaScriptCore/profiler/CallIdentifier.h | |
| parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
| download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz | |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/JavaScriptCore/profiler/CallIdentifier.h')
| -rw-r--r-- | Source/JavaScriptCore/profiler/CallIdentifier.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/JavaScriptCore/profiler/CallIdentifier.h b/Source/JavaScriptCore/profiler/CallIdentifier.h index 2da8a2ff1..bf9f904b0 100644 --- a/Source/JavaScriptCore/profiler/CallIdentifier.h +++ b/Source/JavaScriptCore/profiler/CallIdentifier.h @@ -27,17 +27,17 @@ #ifndef CallIdentifier_h #define CallIdentifier_h -#include <runtime/UString.h> #include <wtf/text/CString.h> #include <wtf/text/StringHash.h> +#include <wtf/text/WTFString.h> namespace JSC { struct CallIdentifier { WTF_MAKE_FAST_ALLOCATED; public: - UString m_name; - UString m_url; + String m_name; + String m_url; unsigned m_lineNumber; CallIdentifier() @@ -45,7 +45,7 @@ namespace JSC { { } - CallIdentifier(const UString& name, const UString& url, int lineNumber) + CallIdentifier(const String& name, const String& url, int lineNumber) : m_name(name) , m_url(!url.isNull() ? url : "") , m_lineNumber(lineNumber) @@ -87,7 +87,7 @@ namespace WTF { template<> struct HashTraits<JSC::CallIdentifier> : GenericHashTraits<JSC::CallIdentifier> { static void constructDeletedValue(JSC::CallIdentifier& slot) { - new (NotNull, &slot) JSC::CallIdentifier(JSC::UString(), JSC::UString(), std::numeric_limits<unsigned>::max()); + new (NotNull, &slot) JSC::CallIdentifier(String(), String(), std::numeric_limits<unsigned>::max()); } static bool isDeletedValue(const JSC::CallIdentifier& value) { |