Attachment 348194 Details for Bug 189002 – Patch

[patch] Patch

bug-189002-20180827135609.patch (text/plain), 2.91 KB, created by Alex Christensen on 2018-08-27 13:56:09 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-27 13:56:09 PDT

Size: 2.91 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 235389)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2018-08-27  Alex Christensen  <achristensen@webkit.org>
>+
>+        REGRESSION(r234985/r234989) WKPageLoadHTMLString with a 16-bit String has the wrong encoding
>+        https://bugs.webkit.org/show_bug.cgi?id=189002
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/C/WKPage.cpp:
>+        (encodingOf):
>+
> 2018-08-27  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix internal builds after r235368
>Index: Source/WebKit/UIProcess/API/C/WKPage.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKPage.cpp	(revision 235371)
>+++ Source/WebKit/UIProcess/API/C/WKPage.cpp	(working copy)
>@@ -202,7 +202,7 @@ void WKPageLoadDataWithUserData(WKPageRe
> static String encodingOf(const String& string)
> {
>     if (string.isNull() || !string.is8Bit())
>-        "utf-16"_s;
>+        return "utf-16"_s;
>     return "latin1"_s;
> }
> 
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 235395)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2018-08-27  Alex Christensen  <achristensen@webkit.org>
>+
>+        REGRESSION(r234985/r234989) WKPageLoadHTMLString with a 16-bit String has the wrong encoding
>+        https://bugs.webkit.org/show_bug.cgi?id=189002
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Tests/WebKit/WillLoad.cpp:
>+        (TestWebKitAPI::TEST_F):
>+
> 2018-08-27  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [Cocoa] Exception (fileType 'dyn.agq8u' is not a valid UTI) raised when dragging an attachment whose file wrapper is a directory
>Index: Tools/TestWebKitAPI/Tests/WebKit/WillLoad.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/WillLoad.cpp	(revision 235391)
>+++ Tools/TestWebKitAPI/Tests/WebKit/WillLoad.cpp	(working copy)
>@@ -218,6 +218,18 @@ TEST_F(WebKit2WillLoadTest, WKPageLoadAl
>     testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("latin1").get(), unreachableURL.get(), 0);
> }
> 
>+TEST_F(WebKit2WillLoadTest, WKPageLoadAlternateHTMLStringUTF16)
>+{
>+    auto htmlString = Util::toWK("<body>Hello, World ð</body>");
>+
>+    auto baseURL = adoptWK(WKURLCreateWithUTF8CString("about:blank"));
>+    auto unreachableURL = adoptWK(WKURLCreateWithUTF8CString("about:other"));
>+
>+    WKPageLoadAlternateHTMLString(webView->page(), htmlString.get(), baseURL.get(), unreachableURL.get());
>+
>+    testWillLoadDataRequestReturnValues(baseURL.get(), Util::toWK("text/html").get(), Util::toWK("utf-16").get(), unreachableURL.get(), 0);
>+}
>+
> TEST_F(WebKit2WillLoadTest, WKPageLoadPlainTextStringWithUserData)
> {
>     WKRetainPtr<WKStringRef> plaintTextString = Util::toWK("Hello, World");

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 189002: 348194