Changeset 162192 in webkit for trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp

Timestamp:

Jan 17, 2014, 12:16:50 AM (11 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r162185, r162186, and r162187.
​http://trac.webkit.org/changeset/162185
​http://trac.webkit.org/changeset/162186
​http://trac.webkit.org/changeset/162187
​https://bugs.webkit.org/show_bug.cgi?id=127164

Broke JSStringCreateWithCharactersNoCopy, as evidenced by a
JSC API test (Requested by ap on #webkit).

• API/JSStringRef.cpp:

(JSStringGetCharactersPtr):
(JSStringGetUTF8CString):
(JSStringIsEqual):

• API/JSStringRefCF.cpp:

(JSStringCreateWithCFString):
(JSStringCopyCFString):

• API/OpaqueJSString.cpp:

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

• API/OpaqueJSString.h:

(OpaqueJSString::create):
(OpaqueJSString::characters):
(OpaqueJSString::deprecatedCharacters):
(OpaqueJSString::OpaqueJSString):

File:

• trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp

@@ -37 +37 @@
     if (!string.isNull())
         return adoptRef(new OpaqueJSString(string));
-    return nullptr;
-}
-
-OpaqueJSString::~OpaqueJSString()
-{
-    if (UChar* characters = m_characters) {
-        // m_characters is put in a local here to avoid an extra atomic load.
-        fastFree(static_cast<void*>(characters));
-    }
+    return 0;
 }
 
@@ -70 +62 @@
     return Identifier(vm, m_string.characters16(), m_string.length());
 }
-
-const UChar* OpaqueJSString::characters()
-{
-    if (!this)
-        return nullptr;
-
-    // m_characters is put in a local here to avoid an extra atomic load.
-    UChar* characters = m_characters;
-    if (characters)
-        return characters;
-
-    unsigned length = m_string.length();
-    UChar* newCharacters = static_cast<UChar*>(fastMalloc(length * sizeof(UChar)));
-
-    if (m_string.is8Bit()) {
-        for (size_t i = 0; i < length; ++i)
-            newCharacters[i] = m_string.characters8()[i];
-    } else
-        memcpy(newCharacters, m_string.characters16(), length * sizeof(UChar));
-
-    if (!m_characters.compare_exchange_strong(characters, newCharacters)) {
-        fastFree(newCharacters);
-        return characters;
-    }
-
-    return newCharacters;
-}
-
-bool OpaqueJSString::equal(const OpaqueJSString* a, const OpaqueJSString* b)
-{
-    if (a == b)
-        return true;
-
-    if (!a || !b)
-        return false;
-
-    return a->m_string == b->m_string;
-}
-
-