Title: [235383] tags/Safari-607.1.3.2/Source/WebKit
- Revision
- 235383
- Author
- bshaf...@apple.com
- Date
- 2018-08-27 10:42:35 -0700 (Mon, 27 Aug 2018)
Log Message
Revert r234989. rdar://problem/43703115
Modified Paths
Diff
Modified: tags/Safari-607.1.3.2/Source/WebKit/ChangeLog (235382 => 235383)
--- tags/Safari-607.1.3.2/Source/WebKit/ChangeLog 2018-08-27 17:38:38 UTC (rev 235382)
+++ tags/Safari-607.1.3.2/Source/WebKit/ChangeLog 2018-08-27 17:42:35 UTC (rev 235383)
@@ -1,3 +1,7 @@
+2018-08-27 Babak Shafiei <bshaf...@apple.com>
+
+ Revert r234989. rdar://problem/43703115
+
2018-08-23 Kocsen Chung <kocsen_ch...@apple.com>
Revert r234941. rdar://problem/43667266
Modified: tags/Safari-607.1.3.2/Source/WebKit/UIProcess/API/C/WKPage.cpp (235382 => 235383)
--- tags/Safari-607.1.3.2/Source/WebKit/UIProcess/API/C/WKPage.cpp 2018-08-27 17:38:38 UTC (rev 235382)
+++ tags/Safari-607.1.3.2/Source/WebKit/UIProcess/API/C/WKPage.cpp 2018-08-27 17:42:35 UTC (rev 235383)
@@ -201,16 +201,16 @@
static String encodingOf(const String& string)
{
- if (string.isNull() || !string.is8Bit())
- "utf-16"_s;
- return "latin1"_s;
+ if (string.isNull() || string.is8Bit())
+ "latin1"_s;
+ return "utf-16"_s;
}
static IPC::DataReference dataFrom(const String& string)
{
- 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) };
+ 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) };
}
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
