Title: [235059] releases/WebKitGTK/webkit-2.22/Source/WebKit
- Revision
- 235059
- Author
- carlo...@webkit.org
- Date
- 2018-08-20 05:53:09 -0700 (Mon, 20 Aug 2018)
Log Message
Merge r234989 - 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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog (235058 => 235059)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2018-08-20 12:53:04 UTC (rev 235058)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2018-08-20 12:53:09 UTC (rev 235059)
@@ -1,5 +1,16 @@
2018-08-17 Alex Christensen <achristen...@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 <achristen...@webkit.org>
+
Replace WebPageProxy::loadAlternateHTMLString with loadAlternateHTML
https://bugs.webkit.org/show_bug.cgi?id=188679
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/C/WKPage.cpp (235058 => 235059)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/C/WKPage.cpp 2018-08-20 12:53:04 UTC (rev 235058)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/C/WKPage.cpp 2018-08-20 12:53:09 UTC (rev 235059)
@@ -201,16 +201,16 @@
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) };
}
static void loadString(WKPageRef pageRef, WKStringRef stringRef, const String& mimeType, const String& baseURL, WKTypeRef userDataRef)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
