Title: [234989] trunk/Source/WebKit
- Revision
- 234989
- Author
- [email protected]
- Date
- 2018-08-17 11:09:39 -0700 (Fri, 17 Aug 2018)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (234988 => 234989)
--- trunk/Source/WebKit/ChangeLog 2018-08-17 17:56:22 UTC (rev 234988)
+++ trunk/Source/WebKit/ChangeLog 2018-08-17 18:09:39 UTC (rev 234989)
@@ -1,5 +1,16 @@
2018-08-17 Alex Christensen <[email protected]>
+ 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 <[email protected]>
+
Replace WebPageProxy::loadAlternateHTMLString with loadAlternateHTML
https://bugs.webkit.org/show_bug.cgi?id=188679
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp (234988 => 234989)
--- trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2018-08-17 17:56:22 UTC (rev 234988)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2018-08-17 18:09:39 UTC (rev 234989)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
