Changeset 132507 in webkit

Timestamp:

Oct 25, 2012, 11:40:53 AM (12 years ago)

Author:

msaboff@apple.com

Message:

REGRESSION (r131836): failures in list styles tests on EFL, GTK
​https://bugs.webkit.org/show_bug.cgi?id=99824

Reviewed by Oliver Hunt.

Source/JavaScriptCore:

Saved start of string since it is modified by call convertUTF8ToUTF16().

• API/JSStringRef.cpp:

(JSStringCreateWithUTF8CString):

Source/WTF:

Fixed ASCII check.
Added placeholder argument for new argument added to convertUTF8ToUTF16() in ​http://trac.webkit.org/changeset/131836.

• wtf/unicode/UTF8.cpp:

(WTF::Unicode::convertUTF8ToUTF16):

• wtf/unicode/glib/UnicodeGLib.cpp:

(WTF::Unicode::convertCase):

Location:

trunk/Source

Files:

• JavaScriptCore/API/JSStringRef.cpp (modified) (1 diff)
• JavaScriptCore/ChangeLog (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/unicode/UTF8.cpp (modified) (1 diff)
• WTF/wtf/unicode/glib/UnicodeGLib.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSStringRef.cpp

@@ -48 +48 @@
         UChar* p = buffer.data();
         bool sourceIsAllASCII;
+        const LChar* stringStart = reinterpret_cast<const LChar*>(string);
         if (conversionOK == convertUTF8ToUTF16(&string, string + length, &p, p + length, &sourceIsAllASCII)) {
             if (sourceIsAllASCII)
-                return OpaqueJSString::create(reinterpret_cast<const LChar*>(string), length).leakRef();
+                return OpaqueJSString::create(stringStart, length).leakRef();
             return OpaqueJSString::create(buffer.data(), p - buffer.data()).leakRef();
         }

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-10-25  Michael Saboff  <msaboff@apple.com>
+
+        REGRESSION (r131836): failures in list styles tests on EFL, GTK
+        https://bugs.webkit.org/show_bug.cgi?id=99824
+
+        Reviewed by Oliver Hunt.
+
+        Saved start of string since it is modified by call convertUTF8ToUTF16().
+
+        * API/JSStringRef.cpp:
+        (JSStringCreateWithUTF8CString):
+
 2012-10-24  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-10-25  Michael Saboff  <msaboff@apple.com>
+
+        REGRESSION (r131836): failures in list styles tests on EFL, GTK
+        https://bugs.webkit.org/show_bug.cgi?id=99824
+
+        Reviewed by Oliver Hunt.
+
+        Fixed ASCII check.
+        Added placeholder argument for new argument added to convertUTF8ToUTF16() in http://trac.webkit.org/changeset/131836.
+
+        * wtf/unicode/UTF8.cpp:
+        (WTF::Unicode::convertUTF8ToUTF16):
+        * wtf/unicode/glib/UnicodeGLib.cpp:
+        (WTF::Unicode::convertCase):
+
 2012-10-25  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WTF/wtf/unicode/UTF8.cpp

@@ -364 +364 @@
 
     if (sourceAllASCII)
-        *sourceAllASCII = !(orAllData & 0x7f);
+        *sourceAllASCII = !(orAllData & ~0x7f);
 
     return result;

trunk/Source/WTF/wtf/unicode/glib/UnicodeGLib.cpp

@@ -95 +95 @@
     UChar* utf16Target = result;
     const char* utf8Source = utf8Result.get();
-    conversionResult = convertUTF8ToUTF16(&utf8Source, utf8Source + utf8ResultLength, &utf16Target, utf16Target + resultLength, true);
+    bool unusedISAllASCII;
+    conversionResult = convertUTF8ToUTF16(&utf8Source, utf8Source + utf8ResultLength, &utf16Target, utf16Target + resultLength, &unusedIsAllASCII, true);
     long utf16ResultLength = utf16Target - result;
     if (conversionResult != conversionOK)