Changeset 130344 in webkit for trunk/Source/JavaScriptCore/API

Timestamp:

Oct 3, 2012, 4:40:28 PM (13 years ago)

Author:

[email protected]

Message:

OpaqueJSString doesn't optimally handle 8 bit strings
​https://bugs.webkit.org/show_bug.cgi?id=98300

Reviewed by Geoffrey Garen.

Change OpaqueJSString to store and manage a String instead of a UChar buffer.
The member string is a copy of any string used during creation.

• API/OpaqueJSString.cpp:

(OpaqueJSString::create):
(OpaqueJSString::identifier):

• API/OpaqueJSString.h:

(OpaqueJSString::characters):
(OpaqueJSString::length):
(OpaqueJSString::string):
(OpaqueJSString::OpaqueJSString):
(OpaqueJSString):

Location:

trunk/Source/JavaScriptCore/API

Files:

• OpaqueJSString.cpp (modified) (1 diff)
• OpaqueJSString.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp

@@ -36 +36 @@
 {
     if (!string.isNull())
-        return adoptRef(new OpaqueJSString(string.characters(), string.length()));
-    return 0;
-}
-
-String OpaqueJSString::string() const
-{
-    if (this && m_characters)
-        return String(m_characters, m_length);
-    return String();
+        return adoptRef(new OpaqueJSString(string));
+    return adoptRef(new OpaqueJSString());
 }
 
 Identifier OpaqueJSString::identifier(JSGlobalData* globalData) const
 {
-    if (!this || !m_characters)
+    if (!this || !m_string.length())
         return Identifier(globalData, static_cast<const char*>(0));
 
-    return Identifier(globalData, m_characters, m_length);
+    return Identifier(globalData, m_string);
 }

trunk/Source/JavaScriptCore/API/OpaqueJSString.h

@@ -49 +49 @@
     JS_EXPORT_PRIVATE static PassRefPtr<OpaqueJSString> create(const String&);
 
-    UChar* characters() { return this ? m_characters : 0; }
-    unsigned length() { return this ? m_length : 0; }
+    const UChar* characters() { return !!this ? m_string.characters() : 0; }
+    unsigned length() { return !!this ? m_string.length() : 0; }
 
-    String string() const;
+    String string() const { return !!this ? m_string : String(); };
     JSC::Identifier identifier(JSC::JSGlobalData*) const;
 
@@ -59 +59 @@
 
     OpaqueJSString()
-        : m_characters(0)
-        , m_length(0)
     {
+        m_string = emptyString();
+    }
+
+    OpaqueJSString(const String& string)
+    {
+        // 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 UChar* characters, unsigned length)
-        : m_length(length)
     {
-        m_characters = new UChar[length];
-        memcpy(m_characters, characters, length * sizeof(UChar));
+        m_string = String(characters, length);
     }
 
-    ~OpaqueJSString()
-    {
-        delete[] m_characters;
-    }
-
-    UChar* m_characters;
-    unsigned m_length;
+    String m_string;
 };