Diff
Modified: trunk/LayoutTests/ChangeLog (198648 => 198649)
--- trunk/LayoutTests/ChangeLog 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/ChangeLog 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,3 +1,16 @@
+2016-03-24 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r198627.
+ https://bugs.webkit.org/show_bug.cgi?id=155856
+
+ Caused use-after-free (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "[Fetch API] Add basic loading of resources"
+ https://bugs.webkit.org/show_bug.cgi?id=155637
+ http://trac.webkit.org/changeset/198627
+
2016-03-24 Saam barati <[email protected]>
Web Inspector: Separate Debugger enable state from the debugger breakpoints enabled state
Modified: trunk/LayoutTests/TestExpectations (198648 => 198649)
--- trunk/LayoutTests/TestExpectations 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/TestExpectations 2016-03-24 23:01:45 UTC (rev 198649)
@@ -317,6 +317,10 @@
imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-cors.htm [ Skip ]
imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-non-cors.htm [ Skip ]
+# Tests that are flaky as failing assertions print a new token generated for each test run.
+imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.html [ Failure ]
+imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker.html [ Failure ]
+
# New W3C ref tests that are failing.
webkit.org/b/148856 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-video-element/video_initially_paused.html [ ImageOnlyFailure ]
Deleted: trunk/LayoutTests/http/tests/resources/download-json-with-delay.php (198648 => 198649)
--- trunk/LayoutTests/http/tests/resources/download-json-with-delay.php 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/http/tests/resources/download-json-with-delay.php 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,20 +0,0 @@
-<?php
-header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
-header("Cache-Control: no-cache, no-store, must-revalidate");
-header("Pragma: no-cache");
-header("Content-Type: application/x-no-buffering-please");
-
-$iteration = $_GET['iteration'];
-$delay = $_GET['delay'];
-
-echo "[$iteration, $delay ";
-
-for ($i = 1; $i <= $iteration; ++$i) {
- echo ", $i, \"foobar\"";
- // Force content to be sent to the browser as is.
- ob_flush();
- flush();
- usleep($delay * 1000);
-}
-echo "]";
-?>
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,3 +1,16 @@
+2016-03-24 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r198627.
+ https://bugs.webkit.org/show_bug.cgi?id=155856
+
+ Caused use-after-free (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "[Fetch API] Add basic loading of resources"
+ https://bugs.webkit.org/show_bug.cgi?id=155637
+ http://trac.webkit.org/changeset/198627
+
2016-03-24 Youenn Fablet <[email protected]>
[Fetch API] Add basic loading of resources
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/accept-header-expected.txt (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/accept-header-expected.txt 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/accept-header-expected.txt 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,3 +1,3 @@
-PASS Request through fetch should have 'accept' header with value '*/*'
+FAIL Request through fetch should have 'accept' header with value '*/*' promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/integrity-expected.txt (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/integrity-expected.txt 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/integrity-expected.txt 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,15 +1,15 @@
-PASS Empty string integrity
-PASS SHA-256 integrity
-PASS SHA-384 integrity
-PASS SHA-512 integrity
-FAIL Invalid integrity assert_unreached: Should have rejected. Reached unreachable code
-PASS Multiple integrities: valid stronger than invalid
-FAIL Multiple integrities: invalid stronger than valid assert_unreached: Should have rejected. Reached unreachable code
-PASS Multiple integrities: invalid as strong as valid
-PASS Multiple integrities: both are valid
-FAIL Multiple integrities: both are invalid assert_unreached: Should have rejected. Reached unreachable code
-FAIL CORS empty integrity promise_test: Unhandled rejection with value: object "TypeError: Type error"
-FAIL CORS SHA-512 integrity promise_test: Unhandled rejection with value: object "TypeError: Type error"
-PASS CORS invalid integrity
+FAIL Empty string integrity promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL SHA-256 integrity promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL SHA-384 integrity promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL SHA-512 integrity promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Invalid integrity assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Multiple integrities: valid stronger than invalid promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Multiple integrities: invalid stronger than valid assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Multiple integrities: invalid as strong as valid promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Multiple integrities: both are valid promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Multiple integrities: both are invalid assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL CORS empty integrity promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL CORS SHA-512 integrity promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL CORS invalid integrity assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-no-cors-expected.txt 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,6 +1,6 @@
-PASS Fetch ../resources/top.txt with no-cors mode
-PASS Fetch http://localhost:8800/fetch/api/resources/top.txt with no-cors mode
-FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: object "TypeError: Type error"
-FAIL Fetch http://www.localhost:8800/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: object "TypeError: Type error"
+FAIL Fetch ../resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetch http://localhost:8800/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetch http://www.localhost:8800/fetch/api/resources/top.txt with no-cors mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin-expected.txt 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,6 +1,6 @@
-PASS Fetch ../resources/top.txt with same-origin mode
-PASS Fetch http://localhost:8800/fetch/api/resources/top.txt with same-origin mode
-PASS Fetch https://localhost:9443/fetch/api/resources/top.txt with same-origin mode
-PASS Fetch http://www.localhost:8800/fetch/api/resources/top.txt with same-origin mode
+FAIL Fetch ../resources/top.txt with same-origin mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetch http://localhost:8800/fetch/api/resources/top.txt with same-origin mode promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetch https://localhost:9443/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetch http://www.localhost:8800/fetch/api/resources/top.txt with same-origin mode assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-forbidden-headers-expected.txt (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-forbidden-headers-expected.txt 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-forbidden-headers-expected.txt 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,26 +1,26 @@
-PASS Accept-Charset is a forbidden request header
-PASS Accept-Encoding is a forbidden request header
-PASS Access-Control-Request-Headers is a forbidden request header
-PASS Access-Control-Request-Method is a forbidden request header
-PASS Connection is a forbidden request header
-PASS Content-Length is a forbidden request header
-PASS Cookie is a forbidden request header
-PASS Cookie2 is a forbidden request header
-PASS Date is a forbidden request header
-PASS DNT is a forbidden request header
-PASS Expect is a forbidden request header
-PASS Host is a forbidden request header
-PASS Keep-Alive is a forbidden request header
-PASS Origin is a forbidden request header
-PASS Referer is a forbidden request header
-PASS TE is a forbidden request header
-PASS Trailer is a forbidden request header
-PASS Transfer-Encoding is a forbidden request header
-PASS Upgrade is a forbidden request header
-PASS Via is a forbidden request header
-PASS Proxy- is a forbidden request header
-PASS Proxy-Test is a forbidden request header
-PASS Sec- is a forbidden request header
-PASS Sec-Test is a forbidden request header
+FAIL Accept-Charset is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Accept-Encoding is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Access-Control-Request-Headers is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Access-Control-Request-Method is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Connection is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Content-Length is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Cookie is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Cookie2 is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Date is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL DNT is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Expect is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Host is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Keep-Alive is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Origin is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Referer is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL TE is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Trailer is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Transfer-Encoding is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Upgrade is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Via is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Proxy- is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Proxy-Test is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Sec- is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Sec-Test is a forbidden request header promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-headers-expected.txt (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-headers-expected.txt 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-headers-expected.txt 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,11 +1,11 @@
-FAIL Fetch with GET assert_equals: Request has header origin: http://localhost:8800 expected (string) "http://localhost:8800" but got (object) null
-FAIL Fetch with HEAD assert_equals: Request has header origin: http://localhost:8800 expected (string) "http://localhost:8800" but got (object) null
-FAIL Fetch with HEAD with body promise_test: Unhandled rejection with value: object "TypeError: Type error"
-PASS Fetch with PUT without body
-PASS Fetch with PUT with body
-PASS Fetch with POST without body
-PASS Fetch with POST with body
-FAIL Fetch with Chicken assert_equals: Request has header content-length: null expected (object) null but got (string) "0"
-PASS Fetch with Chicken with body
+FAIL Fetch with GET promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetch with HEAD promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetch with HEAD with body promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetch with PUT without body promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetch with PUT with body promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetch with POST without body promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetch with POST with body promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetch with Chicken promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetch with Chicken with body promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-about-expected.txt (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-about-expected.txt 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-about-expected.txt 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,6 +1,6 @@
-FAIL Fetching about:blank is OK promise_test: Unhandled rejection with value: object "TypeError: Type error"
-FAIL Fetching about:unicorn is OK promise_test: Unhandled rejection with value: object "TypeError: Type error"
-PASS Fetching about:invalid.com is KO
-PASS Fetching about:config is KO
+FAIL Fetching about:blank is OK promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetching about:unicorn is OK promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetching about:invalid.com is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching about:config is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,5 +1,5 @@
-PASS Regular Blob loading
-PASS Loading an erroneous blob scheme URL
-FAIL Loading a blob URL using POST assert_unreached: Should have rejected. Reached unreachable code
+FAIL Fetching blob:http://localhost:8800/4580501e-3c0f-4b03[...] is OK promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetching [GET] blob:http://www.localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching [POST] blob:http://localhost:8800/ad829fe3-9045-4b29[...] is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker-expected.txt (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker-expected.txt 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-worker-expected.txt 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,5 +1,5 @@
-FAIL Regular Blob loading promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
-FAIL Loading an erroneous blob scheme URL assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
-FAIL Loading a blob URL using POST assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching blob:http://localhost:8800/8807dca8-91bf-4414[...] is OK promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetching [GET] blob:http://www.localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching [POST] blob:http://localhost:8800/41805be3-d8cc-490f[...] is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.js (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.js 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob.js 2016-03-24 23:01:45 UTC (rev 198649)
@@ -4,6 +4,9 @@
}
function checkFetchResponse(url, data, mime, size, desc) {
+ if (!desc)
+ var cut = (url.length >= 45) ? "[...]" : "";
+ desc = "Fetching " + url.substring(0, 45) + cut + " is OK"
promise_test(function(test) {
size = size.toString();
return fetch(url).then(function(resp) {
@@ -19,9 +22,12 @@
}
var blob = new Blob(["Blob's data"], { "type" : "text/plain" });
-checkFetchResponse(URL.createObjectURL(blob), "Blob's data", "text/plain", blob.size, "Regular Blob loading");
+checkFetchResponse(URL.createObjectURL(blob), "Blob's data", "text/plain", blob.size);
function checkKoUrl(url, method, desc) {
+ if (!desc)
+ var cut = (url.length >= 45) ? "[...]" : "";
+ desc = "Fetching [" + method + "] " + url.substring(0, 45) + cut + " is KO"
promise_test(function(test) {
var promise = fetch(url, {"method": method});
return promise_rejects(test, new TypeError(), promise);
@@ -29,7 +35,7 @@
}
var blob2 = new Blob(["Blob's data"], { "type" : "text/plain" });
-checkKoUrl("blob:http://{{domains[www]}}:{{ports[http][0]}}/", "GET", "Loading an erroneous blob scheme URL");
-checkKoUrl(URL.createObjectURL(blob2), "POST", "Loading a blob URL using POST");
+checkKoUrl("blob:http://{{domains[www]}}:{{ports[http][0]}}/", "GET");
+checkKoUrl(URL.createObjectURL(blob2), "POST");
done();
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-data-expected.txt (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-data-expected.txt 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-data-expected.txt 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,8 +1,8 @@
-FAIL Fetching data:,response%27s%20body is OK promise_test: Unhandled rejection with value: object "TypeError: Type error"
-FAIL Fetching data:text/plain;base64,cmVzcG9uc2UncyBib[...] is OK promise_test: Unhandled rejection with value: object "TypeError: Type error"
-FAIL Fetching data:image/png;base64,cmVzcG9uc2UncyBib2[...] is OK promise_test: Unhandled rejection with value: object "TypeError: Type error"
-PASS Fetching [GET] data:notAdataUrl.com is KO
-PASS Fetching [POST] data:,response%27s%20body is KO
-PASS Fetching [HEAD] data:,response%27s%20body is KO
+FAIL Fetching data:,response%27s%20body is OK promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetching data:text/plain;base64,cmVzcG9uc2UncyBib[...] is OK promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetching data:image/png;base64,cmVzcG9uc2UncyBib2[...] is OK promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
+FAIL Fetching [GET] data:notAdataUrl.com is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching [POST] data:,response%27s%20body is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching [HEAD] data:,response%27s%20body is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-others-expected.txt (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-others-expected.txt 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-others-expected.txt 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,18 +1,18 @@
-PASS Fetching aaa://localhost:8800/ is KO
-PASS Fetching cap://localhost:8800/ is KO
-PASS Fetching cid://localhost:8800/ is KO
-PASS Fetching dav://localhost:8800/ is KO
-PASS Fetching dict://localhost:8800/ is KO
-PASS Fetching dns://localhost:8800/ is KO
-PASS Fetching geo://localhost:8800/ is KO
-PASS Fetching im://localhost:8800/ is KO
-PASS Fetching imap://localhost:8800/ is KO
-PASS Fetching ipp://localhost:8800/ is KO
-PASS Fetching ldap://localhost:8800/ is KO
-PASS Fetching mailto://localhost:8800/ is KO
-PASS Fetching nfs://localhost:8800/ is KO
-PASS Fetching pop://localhost:8800/ is KO
-PASS Fetching rtsp://localhost:8800/ is KO
-PASS Fetching snmp://localhost:8800/ is KO
+FAIL Fetching aaa://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching cap://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching cid://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching dav://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching dict://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching dns://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching geo://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching im://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching imap://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching ipp://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching ldap://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching mailto://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching nfs://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching pop://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching rtsp://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
+FAIL Fetching snmp://localhost:8800/ is KO assert_throws: function "function () { throw e }" threw "Fetch is not yet implemented" (undefined) expected object "TypeError" ("TypeError")
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/stream-response-expected.txt (198648 => 198649)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/stream-response-expected.txt 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/stream-response-expected.txt 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,3 +1,3 @@
-FAIL Stream response's body assert_unreached: Body does not exist in response Reached unreachable code
+FAIL Stream response's body promise_test: Unhandled rejection with value: "Fetch is not yet implemented"
Modified: trunk/Source/WebCore/ChangeLog (198648 => 198649)
--- trunk/Source/WebCore/ChangeLog 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/ChangeLog 2016-03-24 23:01:45 UTC (rev 198649)
@@ -1,3 +1,16 @@
+2016-03-24 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r198627.
+ https://bugs.webkit.org/show_bug.cgi?id=155856
+
+ Caused use-after-free (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "[Fetch API] Add basic loading of resources"
+ https://bugs.webkit.org/show_bug.cgi?id=155637
+ http://trac.webkit.org/changeset/198627
+
2016-03-24 Saam barati <[email protected]>
Web Inspector: Separate Debugger enable state from the debugger breakpoints enabled state
Modified: trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.cpp (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.cpp 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.cpp 2016-03-24 23:01:45 UTC (rev 198649)
@@ -31,42 +31,16 @@
#if ENABLE(FETCH_API)
-#include "DOMWindow.h"
-#include "FetchRequest.h"
-#include "FetchResponse.h"
-
namespace WebCore {
-void DOMWindowFetch::fetch(DOMWindow& window, FetchRequest* input, const Dictionary& dictionary, DeferredWrapper&& promise)
+void DOMWindowFetch::fetch(DOMWindow&, FetchRequest*, const Dictionary&, FetchPromise&& promise)
{
- if (!window.scriptExecutionContext())
- return;
- ScriptExecutionContext& context = *window.scriptExecutionContext();
-
- ExceptionCode ec = 0;
- RefPtr<FetchRequest> fetchRequest = FetchRequest::create(context, input, dictionary, ec);
- if (ec) {
- promise.reject(ec);
- return;
- }
- ASSERT(fetchRequest);
- FetchResponse::fetch(context, *fetchRequest, WTFMove(promise));
+ promise.reject(ASCIILiteral("Fetch is not yet implemented"));
}
-void DOMWindowFetch::fetch(DOMWindow& window, const String& url, const Dictionary& dictionary, DeferredWrapper&& promise)
+void DOMWindowFetch::fetch(DOMWindow&, const String&, const Dictionary&, FetchPromise&& promise)
{
- if (!window.scriptExecutionContext())
- return;
- ScriptExecutionContext& context = *window.scriptExecutionContext();
-
- ExceptionCode ec = 0;
- RefPtr<FetchRequest> fetchRequest = FetchRequest::create(context, url, dictionary, ec);
- if (ec) {
- promise.reject(ec);
- return;
- }
- ASSERT(fetchRequest);
- FetchResponse::fetch(context, *fetchRequest, WTFMove(promise));
+ promise.reject(ASCIILiteral("Fetch is not yet implemented"));
}
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h 2016-03-24 23:01:45 UTC (rev 198649)
@@ -30,19 +30,19 @@
#if ENABLE(FETCH_API)
-#include <wtf/Forward.h>
+#include "JSDOMPromise.h"
namespace WebCore {
-class DOMWindow;
-class DeferredWrapper;
class Dictionary;
class FetchRequest;
+class FetchResponse;
class DOMWindowFetch {
public:
- static void fetch(DOMWindow&, FetchRequest*, const Dictionary&, DeferredWrapper&&);
- static void fetch(DOMWindow&, const String&, const Dictionary&, DeferredWrapper&&);
+ using FetchPromise = DOMPromise<RefPtr<FetchResponse>, String>;
+ static void fetch(DOMWindow&, FetchRequest*, const Dictionary&, FetchPromise&&);
+ static void fetch(DOMWindow&, const String&, const Dictionary&, FetchPromise&&);
};
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.cpp (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-03-24 23:01:45 UTC (rev 198649)
@@ -35,15 +35,12 @@
#include "Dictionary.h"
#include "ExceptionCode.h"
#include "FetchBodyOwner.h"
-#include "FormData.h"
#include "HTTPParsers.h"
#include "JSBlob.h"
#include "JSDOMFormData.h"
namespace WebCore {
-static RefPtr<Blob> blobFromArrayBuffer(ArrayBuffer*, const String&);
-
FetchBody::FetchBody(Ref<Blob>&& blob)
: m_type(Type::Blob)
, m_mimeType(blob->type())
@@ -158,46 +155,21 @@
void FetchBody::consume(FetchBodyOwner& owner, Consumer::Type type, DeferredWrapper&& promise)
{
- if (m_type == Type::ArrayBuffer) {
- consumeArrayBuffer(type, promise);
- return;
- }
if (m_type == Type::Text) {
- consumeText(type, promise);
+ consumeText(type, WTFMove(promise));
return;
}
if (m_type == Type::Blob) {
consumeBlob(owner, type, WTFMove(promise));
return;
}
- if (m_type == Type::Loading) {
- // FIXME: We should be able to change the loading type to text if consumer type is JSON or Text.
- m_consumer = Consumer({type, WTFMove(promise)});
- return;
- }
// FIXME: Support other types.
promise.reject<ExceptionCode>(0);
}
-void FetchBody::consumeArrayBuffer(Consumer::Type type, DeferredWrapper& promise)
+void FetchBody::consumeText(Consumer::Type type, DeferredWrapper&& promise)
{
- if (type == Consumer::Type::ArrayBuffer) {
- fulfillPromiseWithArrayBuffer(promise, m_data.get());
- return;
- }
- if (type == Consumer::Type::Blob) {
- promise.resolve(blobFromArrayBuffer(m_data.get(), Blob::normalizedContentType(extractMIMETypeFromMediaType(m_mimeType))));
- return;
- }
-
- ASSERT(type == Consumer::Type::Text || type == Consumer::Type::JSON);
- // FIXME: Do we need TextResourceDecoder to create a String to decode UTF-8 data.
- fulfillTextPromise(type, TextResourceDecoder::create(ASCIILiteral("text/plain"), "UTF-8")->decodeAndFlush(static_cast<const char*>(m_data->data()), m_data->byteLength()), promise);
-}
-
-void FetchBody::consumeText(Consumer::Type type, DeferredWrapper& promise)
-{
ASSERT(type == Consumer::Type::ArrayBuffer || type == Consumer::Type::Blob);
if (type == Consumer::Type::ArrayBuffer) {
@@ -242,26 +214,6 @@
return value;
}
-static inline RefPtr<Blob> blobFromArrayBuffer(ArrayBuffer* buffer, const String& contentType)
-{
- if (!buffer)
- return Blob::create(Vector<char>(), contentType);
-
- // FIXME: We should try to move buffer to Blob without doing this copy.
- Vector<char> value(buffer->byteLength());
- memcpy(value.data(), buffer->data(), buffer->byteLength());
- return Blob::create(WTFMove(value), contentType);
-}
-
-void FetchBody::fulfillTextPromise(FetchBody::Consumer::Type type, const String& text, DeferredWrapper& promise)
-{
- ASSERT(type == Consumer::Type::Text || type == Consumer::Type::JSON);
- if (type == FetchBody::Consumer::Type::Text)
- promise.resolve(text);
- else
- fulfillPromiseWithJSON(promise, text);
-}
-
void FetchBody::loadingFailed()
{
ASSERT(m_consumer);
@@ -271,23 +223,16 @@
void FetchBody::loadedAsArrayBuffer(RefPtr<ArrayBuffer>&& buffer)
{
- if (m_type == Type::Loading) {
- m_type = Type::ArrayBuffer;
- m_data = buffer;
- if (m_consumer) {
- consumeArrayBuffer(m_consumer->type, m_consumer->promise);
- m_consumer = Nullopt;
- }
- return;
- }
-
ASSERT(m_consumer);
ASSERT(m_consumer->type == Consumer::Type::Blob || m_consumer->type == Consumer::Type::ArrayBuffer);
if (m_consumer->type == Consumer::Type::ArrayBuffer)
fulfillPromiseWithArrayBuffer(m_consumer->promise, buffer.get());
else {
ASSERT(m_blob);
- m_consumer->promise.resolve(blobFromArrayBuffer(buffer.get(), m_blob->type()));
+ Vector<char> data;
+ data.reserveCapacity(buffer->byteLength());
+ data.append(static_cast<const char*>(buffer->data()), buffer->byteLength());
+ m_consumer->promise.resolve<RefPtr<Blob>>(Blob::create(WTFMove(data), m_blob->type()));
}
m_consumer = Nullopt;
}
@@ -296,26 +241,13 @@
{
ASSERT(m_consumer);
ASSERT(m_consumer->type == Consumer::Type::Text || m_consumer->type == Consumer::Type::JSON);
-
- fulfillTextPromise(m_consumer->type, text, m_consumer->promise);
+ if (m_consumer->type == Consumer::Type::Text)
+ m_consumer->promise.resolve(text);
+ else
+ fulfillPromiseWithJSON(m_consumer->promise, text);
m_consumer = Nullopt;
}
-RefPtr<FormData> FetchBody::bodyForInternalRequest() const
-{
- if (m_type == Type::None)
- return nullptr;
- if (m_type == Type::Text)
- return FormData::create(UTF8Encoding().encode(m_text, EntitiesForUnencodables));
- if (m_type == Type::Blob) {
- RefPtr<FormData> body = FormData::create();
- body->appendBlob(m_blob->url());
- return body;
- }
- ASSERT_NOT_REACHED();
- return nullptr;
}
-}
-
#endif // ENABLE(FETCH_API)
Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.h (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-03-24 23:01:45 UTC (rev 198649)
@@ -44,7 +44,6 @@
namespace WebCore {
class FetchBodyOwner;
-class FormData;
class FetchBody {
public:
@@ -62,22 +61,18 @@
static FetchBody extract(JSC::ExecState&, JSC::JSValue);
static FetchBody extractFromBody(FetchBody*);
- static FetchBody loadingBody() { return { Type::Loading }; }
FetchBody() = default;
void loadingFailed();
void loadedAsArrayBuffer(RefPtr<ArrayBuffer>&&);
void loadedAsText(String&&);
- RefPtr<FormData> bodyForInternalRequest() const;
-
private:
- enum class Type { None, ArrayBuffer, Loading, Text, Blob, FormData };
+ enum class Type { None, Text, Blob, FormData };
FetchBody(Ref<Blob>&&);
FetchBody(Ref<DOMFormData>&&);
FetchBody(String&&);
- FetchBody(Type type) : m_type(type) { }
struct Consumer {
enum class Type { Text, Blob, JSON, ArrayBuffer };
@@ -89,21 +84,17 @@
Vector<char> extractFromText() const;
bool processIfEmptyOrDisturbed(Consumer::Type, DeferredWrapper&);
- void consumeArrayBuffer(Consumer::Type, DeferredWrapper&);
- void consumeText(Consumer::Type, DeferredWrapper&);
+ void consumeText(Consumer::Type, DeferredWrapper&&);
void consumeBlob(FetchBodyOwner&, Consumer::Type, DeferredWrapper&&);
static FetchLoader::Type loadingType(Consumer::Type);
- static void fulfillTextPromise(FetchBody::Consumer::Type, const String&, DeferredWrapper&);
- static void fulfillArrayBufferPromise(FetchBody::Consumer::Type, const String&, DeferredWrapper&);
- Type m_type { Type::None };
+ Type m_type = Type::None;
String m_mimeType;
- bool m_isDisturbed { false };
+ bool m_isDisturbed = false;
// FIXME: Add support for BufferSource and URLSearchParams.
RefPtr<Blob> m_blob;
RefPtr<DOMFormData> m_formData;
- RefPtr<ArrayBuffer> m_data;
String m_text;
Optional<Consumer> m_consumer;
Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2016-03-24 23:01:45 UTC (rev 198649)
@@ -59,16 +59,19 @@
ASSERT(m_body.isDisturbed());
ASSERT(!m_blobLoader);
- if (!scriptExecutionContext())
- blobLoadingFailed();
-
m_blobLoader = { *this };
m_blobLoader->loader = std::make_unique<FetchLoader>(type, *m_blobLoader);
setPendingActivity(this);
- m_blobLoader->loader->start(*scriptExecutionContext(), blob);
+ if (!scriptExecutionContext() || !m_blobLoader->loader->start(*scriptExecutionContext(), blob))
+ blobLoadingFailed();
}
+void FetchBodyOwner::loadedBlobAsText(String&& text)
+{
+ m_body.loadedAsText(WTFMove(text));
+}
+
void FetchBodyOwner::finishBlobLoading()
{
ASSERT(m_blobLoader);
@@ -77,11 +80,6 @@
unsetPendingActivity(this);
}
-void FetchBodyOwner::loadedBlobAsText(String&& text)
-{
- m_body.loadedAsText(WTFMove(text));
-}
-
void FetchBodyOwner::blobLoadingFailed()
{
m_body.loadingFailed();
Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h 2016-03-24 23:01:45 UTC (rev 198649)
@@ -54,13 +54,6 @@
bool isActive() const { return !!m_blobLoader; }
-protected:
- const FetchBody& body() const { return m_body; }
- FetchBody& body() { return m_body; }
-
- // ActiveDOMObject API
- void stop() override;
-
private:
// Blob loading routines
void loadedBlobAsText(String&&);
@@ -69,6 +62,9 @@
void blobLoadingFailed();
void finishBlobLoading();
+ // ActiveDOMObject API
+ void stop() override;
+
struct BlobLoader final : FetchLoaderClient {
BlobLoader(FetchBodyOwner&);
Modified: trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp 2016-03-24 23:01:45 UTC (rev 198649)
@@ -156,19 +156,14 @@
void FetchHeaders::fill(const FetchHeaders* headers)
{
- ASSERT(m_guard != Guard::Immutable);
-
if (!headers)
return;
- filterAndFill(headers->m_headers, m_guard);
-}
+ ASSERT(m_guard != Guard::Immutable);
-void FetchHeaders::filterAndFill(const HTTPHeaderMap& headers, Guard guard)
-{
ExceptionCode ec;
- for (auto& header : headers) {
- if (canWriteHeader(header.key, header.value, guard, ec)) {
+ for (auto& header : headers->m_headers) {
+ if (canWriteHeader(header.key, header.value, m_guard, ec)) {
if (header.keyAsHTTPHeaderName)
m_headers.add(header.keyAsHTTPHeaderName.value(), header.value);
else
Modified: trunk/Source/WebCore/Modules/fetch/FetchHeaders.h (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/FetchHeaders.h 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/FetchHeaders.h 2016-03-24 23:01:45 UTC (rev 198649)
@@ -64,8 +64,6 @@
void fill(const FetchHeaders*);
- void filterAndFill(const HTTPHeaderMap&, Guard);
-
String fastGet(HTTPHeaderName name) const { return m_headers.get(name); }
void fastSet(HTTPHeaderName name, const String& value) { m_headers.set(name, value); }
@@ -81,8 +79,6 @@
};
Iterator createIterator() { return Iterator(*this); }
- const HTTPHeaderMap& internalHeaders() const { return m_headers; }
-
private:
FetchHeaders(Guard guard) : m_guard(guard) { }
FetchHeaders(Guard guard, const HTTPHeaderMap& headers) : m_guard(guard), m_headers(headers) { }
Modified: trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp 2016-03-24 23:01:45 UTC (rev 198649)
@@ -34,10 +34,8 @@
#include "BlobURL.h"
#include "FetchBody.h"
#include "FetchLoaderClient.h"
-#include "FetchRequest.h"
#include "ResourceRequest.h"
#include "ScriptExecutionContext.h"
-#include "SecurityOrigin.h"
#include "SharedBuffer.h"
#include "TextResourceDecoder.h"
#include "ThreadableBlobRegistry.h"
@@ -45,14 +43,11 @@
namespace WebCore {
-void FetchLoader::start(ScriptExecutionContext& context, Blob& blob)
+bool FetchLoader::start(ScriptExecutionContext& context, Blob& blob)
{
auto urlForReading = BlobURL::createPublicURL(context.securityOrigin());
- if (urlForReading.isEmpty()) {
- m_client.didFail();
- return;
- }
-
+ if (urlForReading.isEmpty())
+ return false;
ThreadableBlobRegistry::registerBlobURL(context.securityOrigin(), urlForReading, blob.url());
ResourceRequest request(urlForReading);
@@ -68,23 +63,9 @@
options.contentSecurityPolicyEnforcement = ContentSecurityPolicyEnforcement::DoNotEnforce;
m_loader = ThreadableLoader::create(&context, this, request, options);
+ return true;
}
-void FetchLoader::start(ScriptExecutionContext& context, const FetchRequest& request)
-{
- // FIXME: Compute loading options according fetch options.
- ThreadableLoaderOptions options;
- options.setSendLoadCallbacks(SendCallbacks);
- options.setSniffContent(DoNotSniffContent);
- options.setDataBufferingPolicy(DoNotBufferData);
- options.preflightPolicy = ConsiderPreflight;
- options.setAllowCredentials(AllowStoredCredentials);
- options.crossOriginRequestPolicy = DenyCrossOriginRequests;
- options.contentSecurityPolicyEnforcement = ContentSecurityPolicyEnforcement::DoNotEnforce;
-
- m_loader = ThreadableLoader::create(&context, this, request.internalRequest(), options);
-}
-
FetchLoader::FetchLoader(Type type, FetchLoaderClient& client)
: m_type(type)
, m_client(client)
@@ -132,11 +113,6 @@
m_client.didFail();
}
-void FetchLoader::didFailRedirectCheck()
-{
- m_client.didFail();
-}
-
} // namespace WebCore
#endif // ENABLE(FETCH_API)
Modified: trunk/Source/WebCore/Modules/fetch/FetchLoader.h (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/FetchLoader.h 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/FetchLoader.h 2016-03-24 23:01:45 UTC (rev 198649)
@@ -39,7 +39,6 @@
class Blob;
class FetchLoaderClient;
-class FetchRequest;
class ScriptExecutionContext;
class FetchLoader final : public ThreadableLoaderClient {
@@ -48,8 +47,7 @@
FetchLoader(Type, FetchLoaderClient&);
- void start(ScriptExecutionContext&, const FetchRequest&);
- void start(ScriptExecutionContext&, Blob&);
+ bool start(ScriptExecutionContext&, Blob&);
void stop();
private:
@@ -58,7 +56,6 @@
void didReceiveData(const char*, int) final;
void didFinishLoading(unsigned long, double) final;
void didFail(const ResourceError&) final;
- void didFailRedirectCheck() final;
private:
Type m_type { Type::ArrayBuffer };
Modified: trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2016-03-24 23:01:45 UTC (rev 198649)
@@ -435,14 +435,6 @@
return String();
}
-ResourceRequest FetchRequest::internalRequest() const
-{
- ResourceRequest request = m_internalRequest.request;
- request.setHTTPHeaderFields(m_headers->internalHeaders());
- request.setHTTPBody(body().bodyForInternalRequest());
- return request;
-}
-
RefPtr<FetchRequest> FetchRequest::clone(ScriptExecutionContext& context, ExceptionCode& ec)
{
if (isDisturbed()) {
Modified: trunk/Source/WebCore/Modules/fetch/FetchRequest.h (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/FetchRequest.h 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.h 2016-03-24 23:01:45 UTC (rev 198649)
@@ -72,9 +72,6 @@
String integrity;
};
- const FetchOptions& fetchOptions() const { return m_internalRequest.options; }
- ResourceRequest internalRequest() const;
-
private:
FetchRequest(ScriptExecutionContext&, FetchBody&&, Ref<FetchHeaders>&&, InternalRequest&&);
Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2016-03-24 23:01:45 UTC (rev 198649)
@@ -153,77 +153,6 @@
return JSC::jsNull();
}
-void FetchResponse::fetch(ScriptExecutionContext& context, const FetchRequest& request, FetchPromise&& promise)
-{
- Ref<FetchResponse> response = adoptRef(*new FetchResponse(context, Type::Basic, FetchBody::loadingBody(), FetchHeaders::create(FetchHeaders::Guard::Immutable), ResourceResponse()));
-
- // Setting pending activity until BodyLoader didFail or didSucceed callback is called.
- response->setPendingActivity(response.ptr());
-
- response->m_bodyLoader = BodyLoader(response.get(), WTFMove(promise));
- response->m_bodyLoader->start(context, request);
-}
-
-void FetchResponse::BodyLoader::didSucceed()
-{
- m_response.m_bodyLoader = Nullopt;
- m_response.unsetPendingActivity(&m_response);
-}
-
-void FetchResponse::BodyLoader::didFail()
-{
- if (m_promise)
- std::exchange(m_promise, Nullopt)->reject(TypeError);
-
- m_response.m_bodyLoader = Nullopt;
- m_response.unsetPendingActivity(&m_response);
-
- // FIXME: Handle the case of failing after didReceiveResponse is called.
-}
-
-FetchResponse::BodyLoader::BodyLoader(FetchResponse& response, FetchPromise&& promise)
- : m_response(response)
- , m_promise(WTFMove(promise))
-{
-}
-
-void FetchResponse::BodyLoader::didReceiveResponse(const ResourceResponse& resourceResponse)
-{
- ASSERT(m_promise);
-
- m_response.m_response = resourceResponse;
- m_response.m_headers->filterAndFill(resourceResponse.httpHeaderFields(), FetchHeaders::Guard::Response);
-
- std::exchange(m_promise, Nullopt)->resolve(&m_response);
-}
-
-void FetchResponse::BodyLoader::didFinishLoadingAsArrayBuffer(RefPtr<ArrayBuffer>&& buffer)
-{
- m_response.body().loadedAsArrayBuffer(WTFMove(buffer));
-}
-
-void FetchResponse::BodyLoader::start(ScriptExecutionContext& context, const FetchRequest& request)
-{
- m_loader = std::make_unique<FetchLoader>(FetchLoader::Type::ArrayBuffer, *this);
- m_loader->start(context, request);
-}
-
-void FetchResponse::BodyLoader::stop()
-{
- if (m_loader)
- m_loader->stop();
-}
-
-void FetchResponse::stop()
-{
- FetchBodyOwner::stop();
- if (m_bodyLoader) {
- RefPtr<FetchResponse> protect(this);
- m_bodyLoader->stop();
- m_bodyLoader = Nullopt;
- }
-}
-
const char* FetchResponse::activeDOMObjectName() const
{
return "Response";
Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.h (198648 => 198649)
--- trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-03-24 23:01:45 UTC (rev 198649)
@@ -42,7 +42,6 @@
namespace WebCore {
class Dictionary;
-class FetchRequest;
typedef int ExceptionCode;
@@ -54,9 +53,6 @@
// FIXME: Binding generator should not require below method to handle optional status parameter.
static RefPtr<FetchResponse> redirect(ScriptExecutionContext& context, const String& url, ExceptionCode& ec) { return redirect(context, url, 302, ec); }
- using FetchPromise = DOMPromise<RefPtr<FetchResponse>, ExceptionCode>;
- static void fetch(ScriptExecutionContext&, const FetchRequest&, FetchPromise&&);
-
void initializeWith(const Dictionary&, ExceptionCode&);
String type() const;
@@ -75,35 +71,14 @@
FetchResponse(ScriptExecutionContext&, Type, FetchBody&&, Ref<FetchHeaders>&&, ResourceResponse&&);
// ActiveDOMObject API
- void stop() final;
const char* activeDOMObjectName() const final;
bool canSuspendForDocumentSuspension() const final;
- class BodyLoader final : public FetchLoaderClient {
- public:
- BodyLoader(FetchResponse&, FetchPromise&&);
-
- void start(ScriptExecutionContext&, const FetchRequest&);
- void stop();
-
- private:
- // FetchLoaderClient API
- void didSucceed() final;
- void didFail() final;
- void didReceiveResponse(const ResourceResponse&);
- void didFinishLoadingAsArrayBuffer(RefPtr<ArrayBuffer>&&) final;
-
- FetchResponse& m_response;
- Optional<FetchPromise> m_promise;
- std::unique_ptr<FetchLoader> m_loader;
- };
-
Type m_type;
ResourceResponse m_response;
Ref<FetchHeaders> m_headers;
bool m_isLocked = false;
bool m_isRedirected = false;
- Optional<BodyLoader> m_bodyLoader;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp (198648 => 198649)
--- trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp 2016-03-24 22:43:06 UTC (rev 198648)
+++ trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp 2016-03-24 23:01:45 UTC (rev 198649)
@@ -136,6 +136,10 @@
PassRefPtr<BlobResourceHandle> BlobResourceHandle::createAsync(BlobData* blobData, const ResourceRequest& request, ResourceHandleClient* client)
{
+ // FIXME: Should probably call didFail() instead of blocking the load without explanation.
+ if (!equalLettersIgnoringASCIICase(request.httpMethod(), "get"))
+ return nullptr;
+
return adoptRef(new BlobResourceHandle(blobData, request, client, true));
}
@@ -203,12 +207,6 @@
if (m_aborted || m_errorCode)
return;
- if (!equalLettersIgnoringASCIICase(firstRequest().httpMethod(), "get")) {
- m_errorCode = methodNotAllowed;
- notifyResponse();
- return;
- }
-
// If the blob data is not found, fail now.
if (!m_blobData) {
m_errorCode = notFoundError;
@@ -580,10 +578,6 @@
ResourceResponse response(firstRequest().url(), m_blobData->contentType(), m_totalRemainingSize, String());
response.setHTTPStatusCode(isRangeRequest ? httpPartialContent : httpOK);
response.setHTTPStatusText(isRangeRequest ? httpPartialContentText : httpOKText);
-
- response.setHTTPHeaderField(HTTPHeaderName::ContentType, m_blobData->contentType());
- response.setHTTPHeaderField(HTTPHeaderName::ContentLength, String::number(m_totalRemainingSize));
-
if (isRangeRequest)
response.setHTTPHeaderField(HTTPHeaderName::ContentRange, ParsedContentRange(m_rangeOffset, m_rangeEnd, m_totalSize).headerValue());
// FIXME: If a resource identified with a blob: URL is a File object, user agents must use that file's name attribute,
