Changeset 234989 in webkit

Timestamp:

Aug 17, 2018 11:09:39 AM (6 years ago)

Author:

achristensen@apple.com

Message:

Fix API tests after r234985
​https://bugs.webkit.org/show_bug.cgi?id=188679

• UIProcess/API/C/WKPage.cpp:

(encodingOf):
(dataFrom):
The encoding of null strings had changed, which is no big deal because there's no data in that encoding,
but switching it back fixes the tests.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-08-17  Alex Christensen  <achristensen@webkit.org>
+
+        Fix API tests after r234985
+        https://bugs.webkit.org/show_bug.cgi?id=188679
+
+        * UIProcess/API/C/WKPage.cpp:
+        (encodingOf):
+        (dataFrom):
+        The encoding of null strings had changed, which is no big deal because there's no data in that encoding,
+        but switching it back fixes the tests.
+
 2018-08-17  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp

@@ -202 +202 @@
 static String encodingOf(const String& string)
 {
-    if (string.isNull() || string.is8Bit())
-        "latin1"_s;
-    return "utf-16"_s;
+    if (string.isNull() || !string.is8Bit())
+        "utf-16"_s;
+    return "latin1"_s;
 }
 
 static IPC::DataReference dataFrom(const String& string)
 {
-    if (string.isNull() || string.is8Bit())
-        return { reinterpret_cast<const uint8_t*>(string.characters8()), string.length() * sizeof(LChar) };
-    return { reinterpret_cast<const uint8_t*>(string.characters16()), string.length() * sizeof(UChar) };
+    if (string.isNull() || !string.is8Bit())
+        return { reinterpret_cast<const uint8_t*>(string.characters16()), string.length() * sizeof(UChar) };
+    return { reinterpret_cast<const uint8_t*>(string.characters8()), string.length() * sizeof(LChar) };
 }