Changeset 162192 in webkit for trunk/Source/JavaScriptCore/API/JSStringRefCF.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/JSStringRefCF.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp

@@ -41 +41 @@
     // it can hold.  (<rdar://problem/6806478>)
     size_t length = CFStringGetLength(string);
-    if (!length)
-        return OpaqueJSString::create(reinterpret_cast<const LChar*>(""), 0).leakRef();
+    if (length) {
+        Vector<LChar, 1024> lcharBuffer(length);
+        CFIndex usedBufferLength;
+        CFIndex convertedSize = CFStringGetBytes(string, CFRangeMake(0, length), kCFStringEncodingISOLatin1, 0, false, lcharBuffer.data(), length, &usedBufferLength);
+        if (static_cast<size_t>(convertedSize) == length && static_cast<size_t>(usedBufferLength) == length)
+            return OpaqueJSString::create(lcharBuffer.data(), length).leakRef();
 
-    Vector<LChar, 1024> lcharBuffer(length);
-    CFIndex usedBufferLength;
-    CFIndex convertedSize = CFStringGetBytes(string, CFRangeMake(0, length), kCFStringEncodingISOLatin1, 0, false, lcharBuffer.data(), length, &usedBufferLength);
-    if (static_cast<size_t>(convertedSize) == length && static_cast<size_t>(usedBufferLength) == length)
-        return OpaqueJSString::create(lcharBuffer.data(), length).leakRef();
-
-    auto buffer = std::make_unique<UniChar[]>(length);
-    CFStringGetCharacters(string, CFRangeMake(0, length), buffer.get());
-    static_assert(sizeof(UniChar) == sizeof(UChar), "UniChar and UChar must be same size");
-    return OpaqueJSString::create(reinterpret_cast<UChar*>(buffer.get()), length).leakRef();
+        auto buffer = std::make_unique<UniChar[]>(length);
+        CFStringGetCharacters(string, CFRangeMake(0, length), buffer.get());
+        COMPILE_ASSERT(sizeof(UniChar) == sizeof(UChar), unichar_and_uchar_must_be_same_size);
+        return OpaqueJSString::create(reinterpret_cast<UChar*>(buffer.get()), length).leakRef();
+    }
+    
+    return OpaqueJSString::create(reinterpret_cast<const LChar*>(""), 0).leakRef();
 }
 
-CFStringRef JSStringCopyCFString(CFAllocatorRef allocator, JSStringRef string)
+CFStringRef JSStringCopyCFString(CFAllocatorRef alloc, JSStringRef string)
 {
     if (!string->length())
         return CFSTR("");
 
-    if (string->is8Bit())
-        return CFStringCreateWithBytes(allocator, reinterpret_cast<const UInt8*>(string->characters8()), string->length(), kCFStringEncodingISOLatin1, false);
-
-    return CFStringCreateWithCharacters(allocator, reinterpret_cast<const UniChar*>(string->characters16()), string->length());
+    return CFStringCreateWithCharacters(alloc, reinterpret_cast<const UniChar*>(string->deprecatedCharacters()), string->length());
 }