diff options
Diffstat (limited to 'Source/JavaScriptCore/API/OpaqueJSString.h')
-rw-r--r-- | Source/JavaScriptCore/API/OpaqueJSString.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/API/OpaqueJSString.h b/Source/JavaScriptCore/API/OpaqueJSString.h index 0464e8813..c374b567a 100644 --- a/Source/JavaScriptCore/API/OpaqueJSString.h +++ b/Source/JavaScriptCore/API/OpaqueJSString.h @@ -31,7 +31,7 @@ namespace JSC { class Identifier; - class JSGlobalData; + class VM; } struct OpaqueJSString : public ThreadSafeRefCounted<OpaqueJSString> { @@ -57,7 +57,10 @@ struct OpaqueJSString : public ThreadSafeRefCounted<OpaqueJSString> { unsigned length() { return !!this ? m_string.length() : 0; } JS_EXPORT_PRIVATE String string() const; - JSC::Identifier identifier(JSC::JSGlobalData*) const; + JSC::Identifier identifier(JSC::VM*) const; +#if PLATFORM(QT) + QString qString() const { return m_string; } +#endif private: friend class WTF::ThreadSafeRefCounted<OpaqueJSString>; @@ -67,12 +70,8 @@ private: } OpaqueJSString(const String& string) + : m_string(string.isolatedCopy()) { - // Make a copy of the source string. - if (string.is8Bit()) - m_string = String(string.characters8(), string.length()); - else - m_string = String(string.characters16(), string.length()); } OpaqueJSString(const LChar* characters, unsigned length) |