Changeset 123541 in webkit

Timestamp:

Jul 24, 2012, 3:33:14 PM (13 years ago)

Author:

zmo@google.com

Message:

Unreviewed, rolling out r123504.
​http://trac.webkit.org/changeset/123504
​https://bugs.webkit.org/show_bug.cgi?id=92169

broke a bunch of text-related tests in chromium mac debug
(Requested by zhenyao on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-07-24

• platform/text/cf/StringCF.cpp:

(WTF::String::createCFString):

• platform/text/cf/StringImplCF.cpp:

(WTF::StringImpl::createCFString):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/text/cf/StringCF.cpp (modified) (1 diff)
• platform/text/cf/StringImplCF.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2012-07-24  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r123504.
+        http://trac.webkit.org/changeset/123504
+        https://bugs.webkit.org/show_bug.cgi?id=92169
+
+        broke a bunch of text-related tests in chromium mac debug
+        (Requested by zhenyao on #webkit).
+
+        * platform/text/cf/StringCF.cpp:
+        (WTF::String::createCFString):
+        * platform/text/cf/StringImplCF.cpp:
+        (WTF::StringImpl::createCFString):
+
 2012-07-24  Kwang Yul Seo  <skyul@company100.net>
 

trunk/Source/WebCore/platform/text/cf/StringCF.cpp ¶

@@ -46 +46 @@
 {
     if (!m_impl)
-        return CFSTR("");
+        return static_cast<CFStringRef>(CFRetain(CFSTR("")));
 
     return m_impl->createCFString();

trunk/Source/WebCore/platform/text/cf/StringImplCF.cpp ¶

@@ -135 +135 @@
 CFStringRef StringImpl::createCFString()
 {
-    if (!m_length || !isMainThread()) {
-        if (is8Bit())
-            return CFStringCreateWithBytes(0, reinterpret_cast<const UInt8*>(characters8()), m_length, kCFStringEncodingISOLatin1, false);
-        return CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(characters16()), m_length);
-    }
-    CFAllocatorRef allocator = StringWrapperCFAllocator::allocator();
+    CFAllocatorRef allocator = (m_length && isMainThread()) ? StringWrapperCFAllocator::allocator() : 0;
+    if (!allocator)
+        return CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(characters()), m_length);
 
     // Put pointer to the StringImpl in a global so the allocator can store it with the CFString.
@@ -146 +143 @@
     StringWrapperCFAllocator::currentString = this;
 
-    CFStringRef string;
-    if (is8Bit())
-        string = CFStringCreateWithBytesNoCopy(allocator, reinterpret_cast<const UInt8*>(characters8()), m_length, kCFStringEncodingISOLatin1, false, kCFAllocatorNull);
-    else
-        string = CFStringCreateWithCharactersNoCopy(allocator, reinterpret_cast<const UniChar*>(characters16()), m_length, kCFAllocatorNull);
+    CFStringRef string = CFStringCreateWithCharactersNoCopy(allocator, reinterpret_cast<const UniChar*>(characters()), m_length, kCFAllocatorNull);
 
     // The allocator cleared the global when it read it, but also clear it here just in case.