Title: [132784] trunk/Source/WTF
Revision
132784
Author
[email protected]
Date
2012-10-29 04:21:07 -0700 (Mon, 29 Oct 2012)

Log Message

Unreviewed, rolling out r132736.
http://trac.webkit.org/changeset/132736
https://bugs.webkit.org/show_bug.cgi?id=100652

It broke all plugin related tests on GTK and on Qt (Requested
by Ossy on #webkit).

Patch by Sheriff Bot <[email protected]> on 2012-10-29

* wtf/text/WTFString.cpp:
(WTF::String::fromUTF8):

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (132783 => 132784)


--- trunk/Source/WTF/ChangeLog	2012-10-29 10:53:06 UTC (rev 132783)
+++ trunk/Source/WTF/ChangeLog	2012-10-29 11:21:07 UTC (rev 132784)
@@ -1,3 +1,15 @@
+2012-10-29  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r132736.
+        http://trac.webkit.org/changeset/132736
+        https://bugs.webkit.org/show_bug.cgi?id=100652
+
+        It broke all plugin related tests on GTK and on Qt (Requested
+        by Ossy on #webkit).
+
+        * wtf/text/WTFString.cpp:
+        (WTF::String::fromUTF8):
+
 2012-10-27  Michael Saboff  <[email protected]>
 
         Try to create AtomicString as 8 bit where possible

Modified: trunk/Source/WTF/wtf/text/WTFString.cpp (132783 => 132784)


--- trunk/Source/WTF/wtf/text/WTFString.cpp	2012-10-29 10:53:06 UTC (rev 132783)
+++ trunk/Source/WTF/wtf/text/WTFString.cpp	2012-10-29 11:21:07 UTC (rev 132784)
@@ -862,13 +862,9 @@
 
     // Try converting into the buffer.
     const char* stringCurrent = reinterpret_cast<const char*>(stringStart);
-    bool isAllASCII;
-    if (convertUTF8ToUTF16(&stringCurrent, reinterpret_cast<const char *>(stringStart + length), &buffer, bufferEnd, &isAllASCII) != conversionOK)
+    if (convertUTF8ToUTF16(&stringCurrent, reinterpret_cast<const char *>(stringStart + length), &buffer, bufferEnd) != conversionOK)
         return String();
 
-    if (isAllASCII)
-        return String(stringStart, length);
-
     // stringBuffer is full (the input must have been all ascii) so just return it!
     if (buffer == bufferEnd)
         return stringBuffer;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to