Title: [132507] trunk/Source
Revision
132507
Author
msab...@apple.com
Date
2012-10-25 11:40:53 -0700 (Thu, 25 Oct 2012)

Log 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/_javascript_Core:

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):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/API/JSStringRef.cpp (132506 => 132507)


--- trunk/Source/_javascript_Core/API/JSStringRef.cpp	2012-10-25 18:20:17 UTC (rev 132506)
+++ trunk/Source/_javascript_Core/API/JSStringRef.cpp	2012-10-25 18:40:53 UTC (rev 132507)
@@ -47,9 +47,10 @@
         Vector<UChar, 1024> buffer(length);
         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();
         }
     }

Modified: trunk/Source/_javascript_Core/ChangeLog (132506 => 132507)


--- trunk/Source/_javascript_Core/ChangeLog	2012-10-25 18:20:17 UTC (rev 132506)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-10-25 18:40:53 UTC (rev 132507)
@@ -1,3 +1,15 @@
+2012-10-25  Michael Saboff  <msab...@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  <fpi...@apple.com>
 
         DFG NewArrayBuffer node should keep its data in a structure on the side to free up one of the opInfos

Modified: trunk/Source/WTF/ChangeLog (132506 => 132507)


--- trunk/Source/WTF/ChangeLog	2012-10-25 18:20:17 UTC (rev 132506)
+++ trunk/Source/WTF/ChangeLog	2012-10-25 18:40:53 UTC (rev 132507)
@@ -1,3 +1,18 @@
+2012-10-25  Michael Saboff  <msab...@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.du...@intel.com>
 
         [EFL][WK2] Remove some C'ism from EwkView

Modified: trunk/Source/WTF/wtf/unicode/UTF8.cpp (132506 => 132507)


--- trunk/Source/WTF/wtf/unicode/UTF8.cpp	2012-10-25 18:20:17 UTC (rev 132506)
+++ trunk/Source/WTF/wtf/unicode/UTF8.cpp	2012-10-25 18:40:53 UTC (rev 132507)
@@ -363,7 +363,7 @@
     *targetStart = target;
 
     if (sourceAllASCII)
-        *sourceAllASCII = !(orAllData & 0x7f);
+        *sourceAllASCII = !(orAllData & ~0x7f);
 
     return result;
 }

Modified: trunk/Source/WTF/wtf/unicode/glib/UnicodeGLib.cpp (132506 => 132507)


--- trunk/Source/WTF/wtf/unicode/glib/UnicodeGLib.cpp	2012-10-25 18:20:17 UTC (rev 132506)
+++ trunk/Source/WTF/wtf/unicode/glib/UnicodeGLib.cpp	2012-10-25 18:40:53 UTC (rev 132507)
@@ -94,7 +94,8 @@
     // Convert the result to UTF-16.
     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)
         *error = true;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to