Attachment 356319 Details for Bug 182325 – Patch

[patch] Patch

bug-182325-20181201205954.patch (text/plain), 4.45 KB, created by Rob Buis on 2018-12-01 11:59:55 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2018-12-01 11:59:55 PST

Size: 4.45 KB

patch

obsolete

>Subversion Revision: 238746
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0abaa4022a9a3f28c453869eeb5ffb1b79640132..5b03edb5da86efa4a473129fa4db6c4b054312ed 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-12-01  Rob Buis  <rbuis@igalia.com>
>+
>+        Align with Fetch on data: URLs
>+        https://bugs.webkit.org/show_bug.cgi?id=182325
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: web-platform-tests/fetch/api/basic/scheme-data.any.html
>+
>+        * platform/network/DataURLDecoder.cpp:
>+        (WebCore::DataURLDecoder::createDecodeTask):
>+        (WebCore::DataURLDecoder::decode):
>+
> 2018-11-30  Basuke Suzuki  <basuke.suzuki@sony.com>
> 
>         [Curl] Add API for ProtectionSpace.
>diff --git a/Source/WebCore/platform/network/DataURLDecoder.cpp b/Source/WebCore/platform/network/DataURLDecoder.cpp
>index 3f4fb1ad884a782bdc614fd394fe7771aba54a4f..76c16333d5a935a87c666feb7c2d032d825cb351 100644
>--- a/Source/WebCore/platform/network/DataURLDecoder.cpp
>+++ b/Source/WebCore/platform/network/DataURLDecoder.cpp
>@@ -184,10 +184,12 @@ void decode(const URL& url, const ScheduleContext& scheduleContext, DecodeComple
>     ASSERT(url.protocolIsData());
> 
>     decodeQueue().dispatch([decodeTask = createDecodeTask(url, scheduleContext, WTFMove(completionHandler))]() mutable {
>-        if (decodeTask->isBase64)
>-            decodeBase64(*decodeTask);
>-        else
>-            decodeEscaped(*decodeTask);
>+        if (decodeTask->urlString.find(',') != notFound) {
>+            if (decodeTask->isBase64)
>+                decodeBase64(*decodeTask);
>+            else
>+                decodeEscaped(*decodeTask);
>+        }
> 
> #if HAVE(RUNLOOP_TIMER)
>         DecodingResultDispatcher::dispatch(WTFMove(decodeTask));
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index 0b06b28f398a7073d956e82762a238939025f031..d7a266e85b6ccb7800973fc5b1ea1059d98a06f8 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-12-01  Rob Buis  <rbuis@igalia.com>
>+
>+        Align with Fetch on data: URLs
>+        https://bugs.webkit.org/show_bug.cgi?id=182325
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * web-platform-tests/fetch/api/basic/scheme-data.any-expected.txt:
>+        * web-platform-tests/fetch/api/basic/scheme-data.any.worker-expected.txt:
>+
> 2018-11-28  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Update web-platform-tests/shadow-dom
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-data.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-data.any-expected.txt
>index 618c8448e3885160ca9d9a54fceb54b2533f81b7..65b2f320eb760321591a1012ff84a75a164ebec7 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-data.any-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-data.any-expected.txt
>@@ -1,3 +1,4 @@
>+CONSOLE MESSAGE: Fetch API cannot load data:notAdataUrl.com.
> 
> PASS Fetching data:,response%27s%20body is OK 
> PASS Fetching data:,response%27s%20body is OK (same-origin) 
>@@ -6,5 +7,5 @@ PASS Fetching data:text/plain;base64,cmVzcG9uc2UncyBib[...] is OK
> PASS Fetching data:image/png;base64,cmVzcG9uc2UncyBib2[...] is OK 
> PASS Fetching [POST] data:,response%27s%20body is OK 
> PASS Fetching [HEAD] data:,response%27s%20body is OK 
>-FAIL Fetching [GET] data:notAdataUrl.com is KO assert_unreached: Should have rejected: undefined Reached unreachable code
>+PASS Fetching [GET] data:notAdataUrl.com is KO 
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-data.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-data.any.worker-expected.txt
>index 618c8448e3885160ca9d9a54fceb54b2533f81b7..c75f064184f5880bdbf54ef85603c3760ade1301 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-data.any.worker-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-data.any.worker-expected.txt
>@@ -6,5 +6,5 @@ PASS Fetching data:text/plain;base64,cmVzcG9uc2UncyBib[...] is OK
> PASS Fetching data:image/png;base64,cmVzcG9uc2UncyBib2[...] is OK 
> PASS Fetching [POST] data:,response%27s%20body is OK 
> PASS Fetching [HEAD] data:,response%27s%20body is OK 
>-FAIL Fetching [GET] data:notAdataUrl.com is KO assert_unreached: Should have rejected: undefined Reached unreachable code
>+PASS Fetching [GET] data:notAdataUrl.com is KO 
>

Actions: View | Formatted Diff | Diff

Attachments on bug 182325: 356308 | 356310 | 356312 | 356314 | 356319 | 356335 | 356348 | 356359 | 356404 | 356504 | 356588 | 360026 | 360096 | 360101 | 360102 | 360104 | 360106 | 360239 | 360365 | 360367 | 360370 | 360499 | 361798 | 361806 | 361842