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/runtime/Identifier.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/runtime/Identifier.h')
-rw-r--r-- | Source/JavaScriptCore/runtime/Identifier.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/JavaScriptCore/runtime/Identifier.h b/Source/JavaScriptCore/runtime/Identifier.h index 196fdca23..bdcfbd187 100644 --- a/Source/JavaScriptCore/runtime/Identifier.h +++ b/Source/JavaScriptCore/runtime/Identifier.h @@ -23,9 +23,9 @@ #include "JSGlobalData.h" #include <wtf/ThreadSpecific.h> -#include "UString.h" #include <wtf/WTFThreadData.h> #include <wtf/text/CString.h> +#include <wtf/text/WTFString.h> namespace JSC { @@ -45,14 +45,14 @@ namespace JSC { Identifier(JSGlobalData* globalData, const char (&characters)[charactersCount]) : m_string(add(globalData, characters)) { } Identifier(ExecState* exec, StringImpl* rep) : m_string(add(exec, rep)) { } - Identifier(ExecState* exec, const UString& s) : m_string(add(exec, s.impl())) { } + Identifier(ExecState* exec, const String& s) : m_string(add(exec, s.impl())) { } Identifier(JSGlobalData* globalData, const LChar* s, int length) : m_string(add(globalData, s, length)) { } Identifier(JSGlobalData* globalData, const UChar* s, int length) : m_string(add(globalData, s, length)) { } Identifier(JSGlobalData* globalData, StringImpl* rep) : m_string(add(globalData, rep)) { } - Identifier(JSGlobalData* globalData, const UString& s) : m_string(add(globalData, s.impl())) { } + Identifier(JSGlobalData* globalData, const String& s) : m_string(add(globalData, s.impl())) { } - const UString& ustring() const { return m_string; } + const String& string() const { return m_string; } StringImpl* impl() const { return m_string.impl(); } const UChar* characters() const { return m_string.characters(); } @@ -91,7 +91,7 @@ namespace JSC { JS_EXPORT_PRIVATE static PassRefPtr<StringImpl> add(ExecState*, const char*); private: - UString m_string; + String m_string; template <typename CharType> ALWAYS_INLINE static uint32_t toUInt32FromCharacters(const CharType* characters, unsigned length, bool& ok); |