Diff
Modified: trunk/LayoutTests/ChangeLog (232308 => 232309)
--- trunk/LayoutTests/ChangeLog 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/LayoutTests/ChangeLog 2018-05-30 20:44:08 UTC (rev 232309)
@@ -1,3 +1,21 @@
+2018-05-30 Youenn Fablet <[email protected]>
+
+ Rename CrossOriginResourcePolicy same to same-origin
+ https://bugs.webkit.org/show_bug.cgi?id=186080
+
+ Reviewed by Chris Dumez.
+
+ * http/wpt/cross-origin-resource-policy/fetch-expected.txt:
+ * http/wpt/cross-origin-resource-policy/fetch-in-iframe-expected.txt:
+ * http/wpt/cross-origin-resource-policy/fetch-in-iframe.html:
+ * http/wpt/cross-origin-resource-policy/fetch.html:
+ * http/wpt/cross-origin-resource-policy/iframe-loads-expected.txt:
+ * http/wpt/cross-origin-resource-policy/iframe-loads.html:
+ * http/wpt/cross-origin-resource-policy/image-loads-expected.txt:
+ * http/wpt/cross-origin-resource-policy/image-loads.html:
+ * http/wpt/cross-origin-resource-policy/script-loads-expected.txt:
+ * http/wpt/cross-origin-resource-policy/script-loads.html:
+
2018-05-30 Jer Noble <[email protected]>
Media elements outside fullscreen should not be considered main content.
Modified: trunk/LayoutTests/http/wpt/cross-origin-resource-policy/fetch-expected.txt (232308 => 232309)
--- trunk/LayoutTests/http/wpt/cross-origin-resource-policy/fetch-expected.txt 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/LayoutTests/http/wpt/cross-origin-resource-policy/fetch-expected.txt 2018-05-30 20:44:08 UTC (rev 232309)
@@ -1,26 +1,26 @@
-CONSOLE MESSAGE: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same because it violates the resource's Cross-Origin-Resource-Policy response header.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same due to access control checks.
+CONSOLE MESSAGE: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-origin because it violates the resource's Cross-Origin-Resource-Policy response header.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-origin due to access control checks.
CONSOLE MESSAGE: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-site because it violates the resource's Cross-Origin-Resource-Policy response header.
CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-site due to access control checks.
-CONSOLE MESSAGE: Cancelled load to https://localhost:9443/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same because it violates the resource's Cross-Origin-Resource-Policy response header.
-CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same due to access control checks.
-CONSOLE MESSAGE: Cancelled load to http://localhost:8801/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same because it violates the resource's Cross-Origin-Resource-Policy response header.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same due to access control checks.
-CONSOLE MESSAGE: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same because it violates the resource's Cross-Origin-Resource-Policy response header.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same due to access control checks.
-CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same denied by Cross-Origin Resource Sharing policy: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/redirect.py?corp=same&redirectTo=http%3A%2F%2Flocalhost%3A8800%2FWebKit%2Fcross-origin-resource-policy%2Fresources%2Fhello.py%3Fcorp%3Dsame because it violates the resource's Cross-Origin-Resource-Policy response header.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/redirect.py?corp=same&redirectTo=http%3A%2F%2Flocalhost%3A8800%2FWebKit%2Fcross-origin-resource-policy%2Fresources%2Fhello.py%3Fcorp%3Dsame due to access control checks.
+CONSOLE MESSAGE: Cancelled load to https://localhost:9443/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-origin because it violates the resource's Cross-Origin-Resource-Policy response header.
+CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-origin due to access control checks.
+CONSOLE MESSAGE: Cancelled load to http://localhost:8801/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-origin because it violates the resource's Cross-Origin-Resource-Policy response header.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-origin due to access control checks.
+CONSOLE MESSAGE: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-origin because it violates the resource's Cross-Origin-Resource-Policy response header.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-origin due to access control checks.
+CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-origin denied by Cross-Origin Resource Sharing policy: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/redirect.py?corp=same-origin&redirectTo=http%3A%2F%2Flocalhost%3A8800%2FWebKit%2Fcross-origin-resource-policy%2Fresources%2Fhello.py%3Fcorp%3Dsame-origin because it violates the resource's Cross-Origin-Resource-Policy response header.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/redirect.py?corp=same-origin&redirectTo=http%3A%2F%2Flocalhost%3A8800%2FWebKit%2Fcross-origin-resource-policy%2Fresources%2Fhello.py%3Fcorp%3Dsame-origin due to access control checks.
-PASS Same-origin fetch with a 'Cross-Origin-Resource-Policy: same' response header.
+PASS Same-origin fetch with a 'Cross-Origin-Resource-Policy: same-origin' response header.
PASS Same-origin fetch with a 'Cross-Origin-Resource-Policy: same-site' response header.
-PASS Cross-origin cors fetch with a 'Cross-Origin-Resource-Policy: same' response header.
+PASS Cross-origin cors fetch with a 'Cross-Origin-Resource-Policy: same-origin' response header.
PASS Cross-origin cors fetch with a 'Cross-Origin-Resource-Policy: same-site' response header.
-PASS Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same' response header.
+PASS Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same-origin' response header.
PASS Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same-site' response header.
PASS Cross-origin no-cors fetch to a same-site URL with a 'Cross-Origin-Resource-Policy: same-site' response header.
-PASS Cross-origin no-cors fetch to a same-site URL with a 'Cross-Origin-Resource-Policy: same' response header.
+PASS Cross-origin no-cors fetch to a same-site URL with a 'Cross-Origin-Resource-Policy: same-origin' response header.
PASS Valid cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same-site' response header.
-PASS Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same' response header after a redirection.
-PASS Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same' response header after a cross-origin redirection.
-PASS Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same' redirect response header.
+PASS Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same-origin' response header after a redirection.
+PASS Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same-origin' response header after a cross-origin redirection.
+PASS Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same-origin' redirect response header.
Modified: trunk/LayoutTests/http/wpt/cross-origin-resource-policy/fetch-in-iframe-expected.txt (232308 => 232309)
--- trunk/LayoutTests/http/wpt/cross-origin-resource-policy/fetch-in-iframe-expected.txt 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/LayoutTests/http/wpt/cross-origin-resource-policy/fetch-in-iframe-expected.txt 2018-05-30 20:44:08 UTC (rev 232309)
@@ -1,12 +1,12 @@
-CONSOLE MESSAGE: Cancelled load to http://localhost:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same because it violates the resource's Cross-Origin-Resource-Policy response header.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same due to access control checks.
+CONSOLE MESSAGE: Cancelled load to http://localhost:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-origin because it violates the resource's Cross-Origin-Resource-Policy response header.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-origin due to access control checks.
CONSOLE MESSAGE: Cancelled load to http://localhost:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-site because it violates the resource's Cross-Origin-Resource-Policy response header.
CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-site due to access control checks.
-CONSOLE MESSAGE: Cancelled load to http://localhost:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same because it violates the resource's Cross-Origin-Resource-Policy response header.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same due to access control checks.
+CONSOLE MESSAGE: Cancelled load to http://localhost:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-origin because it violates the resource's Cross-Origin-Resource-Policy response header.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/WebKit/cross-origin-resource-policy/resources/hello.py?corp=same-origin due to access control checks.
-PASS Cross-origin fetch in a data: iframe load fails if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same' response header.
+PASS Cross-origin fetch in a data: iframe load fails if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same-origin' response header.
PASS Cross-origin fetch in a data: iframe load fails if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same-site' response header.
-PASS Cross-origin fetch in a cross origin iframe load fails if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same' response header.
-PASS Same-origin fetch in a cross origin iframe load succeeds if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same' response header.
+PASS Cross-origin fetch in a cross origin iframe load fails if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same-origin' response header.
+PASS Same-origin fetch in a cross origin iframe load succeeds if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same-origin' response header.
Modified: trunk/LayoutTests/http/wpt/cross-origin-resource-policy/fetch-in-iframe.html (232308 => 232309)
--- trunk/LayoutTests/http/wpt/cross-origin-resource-policy/fetch-in-iframe.html 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/LayoutTests/http/wpt/cross-origin-resource-policy/fetch-in-iframe.html 2018-05-30 20:44:08 UTC (rev 232309)
@@ -47,17 +47,17 @@
// This above data URL should be equivalent to resources/iframeFetch.html
var dataIFrameURL = "data:text/html;base64,PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KICAgIDxzY3JpcHQ+CiAgICAgICAgZnVuY3Rpb24gcHJvY2Vzc01lc3NhZ2UoZXZlbnQpCiAgICAgICAgewogICAgICAgICAgICBmZXRjaChldmVudC5kYXRhLCB7IG1vZGU6ICJuby1jb3JzIiB9KS50aGVuKCgpID0+IHsKICAgICAgICAgICAgICAgIHBhcmVudC5wb3N0TWVzc2FnZSgib2siLCAiKiIpOwogICAgICAgICAgICB9LCAoKSA9PiB7CiAgICAgICAgICAgICAgICBwYXJlbnQucG9zdE1lc3NhZ2UoImtvIiwgIioiKTsKICAgICAgICAgICAgfSk7CiAgICAgICAgfQogICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIiwgcHJvY2Vzc01lc3NhZ2UsIGZhbHNlKTsKICAgIDwvc2NyaXB0Pgo8L2hlYWQ+Cjxib2R5PgogICAgPGgzPlRoZSBpZnJhbWUgbWFraW5nIGEgc2FtZSBvcmlnaW4gZmV0Y2ggY2FsbC48L2gzPgo8L2JvZHk+CjwvaHRtbD4K";
-title = "Cross-origin fetch in a data: iframe load fails if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same' response header.";
-loadIFrameAndFetch(dataIFrameURL, localBaseURL + "resources/hello.py?corp=same", "ko");
+title = "Cross-origin fetch in a data: iframe load fails if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same-origin' response header.";
+loadIFrameAndFetch(dataIFrameURL, localBaseURL + "resources/hello.py?corp=same-origin", "ko");
title = "Cross-origin fetch in a data: iframe load fails if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same-site' response header.";
loadIFrameAndFetch(dataIFrameURL, localBaseURL + "resources/hello.py?corp=same-site", "ko");
-title = "Cross-origin fetch in a cross origin iframe load fails if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same' response header.";
-loadIFrameAndFetch(remoteBaseURL + "resources/iframeFetch.html", localBaseURL + "resources/hello.py?corp=same", "ko");
+title = "Cross-origin fetch in a cross origin iframe load fails if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same-origin' response header.";
+loadIFrameAndFetch(remoteBaseURL + "resources/iframeFetch.html", localBaseURL + "resources/hello.py?corp=same-origin", "ko");
-title = "Same-origin fetch in a cross origin iframe load succeeds if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same' response header.";
-loadIFrameAndFetch(remoteBaseURL + "resources/iframeFetch.html", remoteBaseURL + "resources/hello.py?corp=same", "ok");
+title = "Same-origin fetch in a cross origin iframe load succeeds if the server blocks cross-origin loads with a 'Cross-Origin-Resource-Policy: same-origin' response header.";
+loadIFrameAndFetch(remoteBaseURL + "resources/iframeFetch.html", remoteBaseURL + "resources/hello.py?corp=same-origin", "ok");
</script>
</body>
</html>
Modified: trunk/LayoutTests/http/wpt/cross-origin-resource-policy/fetch.html (232308 => 232309)
--- trunk/LayoutTests/http/wpt/cross-origin-resource-policy/fetch.html 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/LayoutTests/http/wpt/cross-origin-resource-policy/fetch.html 2018-05-30 20:44:08 UTC (rev 232309)
@@ -14,9 +14,9 @@
const httpsBaseURL = host.HTTPS_ORIGIN + window.location.pathname.replace(/\/[^\/]*$/, '/') ;
promise_test(async () => {
- const response = await fetch("./resources/hello.py?corp=same");
+ const response = await fetch("./resources/hello.py?corp=same-origin");
assert_equals(await response.text(), "hello");
-}, "Same-origin fetch with a 'Cross-Origin-Resource-Policy: same' response header.");
+}, "Same-origin fetch with a 'Cross-Origin-Resource-Policy: same-origin' response header.");
promise_test(async () => {
const response = await fetch("./resources/hello.py?corp=same-site");
@@ -24,9 +24,9 @@
}, "Same-origin fetch with a 'Cross-Origin-Resource-Policy: same-site' response header.");
promise_test(async (test) => {
- const response = await fetch(remoteBaseURL + "resources/hello.py?corp=same");
+ const response = await fetch(remoteBaseURL + "resources/hello.py?corp=same-origin");
assert_equals(await response.text(), "hello");
-}, "Cross-origin cors fetch with a 'Cross-Origin-Resource-Policy: same' response header.");
+}, "Cross-origin cors fetch with a 'Cross-Origin-Resource-Policy: same-origin' response header.");
promise_test(async (test) => {
const response = await fetch(remoteBaseURL + "resources/hello.py?corp=same-site");
@@ -34,9 +34,9 @@
}, "Cross-origin cors fetch with a 'Cross-Origin-Resource-Policy: same-site' response header.");
promise_test((test) => {
- const remoteURL = remoteBaseURL + "resources/hello.py?corp=same";
+ const remoteURL = remoteBaseURL + "resources/hello.py?corp=same-origin";
return promise_rejects(test, new TypeError, fetch(remoteURL, { mode : "no-cors" }));
-}, "Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same' response header.");
+}, "Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same-origin' response header.");
promise_test((test) => {
const remoteURL = remoteBaseURL + "resources/hello.py?corp=same-site";
@@ -49,9 +49,9 @@
}, "Cross-origin no-cors fetch to a same-site URL with a 'Cross-Origin-Resource-Policy: same-site' response header.");
promise_test((test) => {
- const remoteURL = httpsBaseURL + "resources/hello.py?corp=same";
+ const remoteURL = httpsBaseURL + "resources/hello.py?corp=same-origin";
return promise_rejects(test, new TypeError, fetch(remoteURL, { mode : "no-cors" }));
-}, "Cross-origin no-cors fetch to a same-site URL with a 'Cross-Origin-Resource-Policy: same' response header.");
+}, "Cross-origin no-cors fetch to a same-site URL with a 'Cross-Origin-Resource-Policy: same-origin' response header.");
promise_test(async (test) => {
const remoteSameSiteURL = remoteSameSiteBaseURL + "resources/hello.py?corp=same-site";
@@ -58,26 +58,26 @@
await fetch(remoteSameSiteURL, { mode: "no-cors" });
- return promise_rejects(test, new TypeError, fetch(remoteSameSiteBaseURL + "resources/hello.py?corp=same", { mode: "no-cors" }));
+ return promise_rejects(test, new TypeError, fetch(remoteSameSiteBaseURL + "resources/hello.py?corp=same-origin", { mode: "no-cors" }));
}, "Valid cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same-site' response header.");
promise_test((test) => {
- const finalURL = remoteBaseURL + "resources/hello.py?corp=same";
+ const finalURL = remoteBaseURL + "resources/hello.py?corp=same-origin";
return promise_rejects(test, new TypeError, fetch("resources/redirect.py?redirectTo=" + encodeURIComponent(finalURL), { mode: "no-cors" }));
-}, "Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same' response header after a redirection.");
+}, "Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same-origin' response header after a redirection.");
promise_test((test) => {
- const finalURL = localBaseURL + "resources/hello.py?corp=same";
+ const finalURL = localBaseURL + "resources/hello.py?corp=same-origin";
return fetch(remoteBaseURL + "resources/redirect.py?redirectTo=" + encodeURIComponent(finalURL), { mode: "no-cors" });
-}, "Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same' response header after a cross-origin redirection.");
+}, "Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same-origin' response header after a cross-origin redirection.");
promise_test(async (test) => {
- const finalURL = localBaseURL + "resources/hello.py?corp=same";
+ const finalURL = localBaseURL + "resources/hello.py?corp=same-origin";
await fetch(finalURL, { mode: "no-cors" });
- return promise_rejects(test, new TypeError, fetch(remoteBaseURL + "resources/redirect.py?corp=same&redirectTo=" + encodeURIComponent(finalURL), { mode: "no-cors" }));
-}, "Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same' redirect response header.");
+ return promise_rejects(test, new TypeError, fetch(remoteBaseURL + "resources/redirect.py?corp=same-origin&redirectTo=" + encodeURIComponent(finalURL), { mode: "no-cors" }));
+}, "Cross-origin no-cors fetch with a 'Cross-Origin-Resource-Policy: same-origin' redirect response header.");
</script>
</body>
</html>
Modified: trunk/LayoutTests/http/wpt/cross-origin-resource-policy/iframe-loads-expected.txt (232308 => 232309)
--- trunk/LayoutTests/http/wpt/cross-origin-resource-policy/iframe-loads-expected.txt 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/LayoutTests/http/wpt/cross-origin-resource-policy/iframe-loads-expected.txt 2018-05-30 20:44:08 UTC (rev 232309)
@@ -1,5 +1,5 @@
-CONSOLE MESSAGE: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/iframe.py?corp=same because it violates the resource's Cross-Origin-Resource-Policy response header.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/iframe.py?corp=same due to access control checks.
+CONSOLE MESSAGE: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/iframe.py?corp=same-origin because it violates the resource's Cross-Origin-Resource-Policy response header.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/iframe.py?corp=same-origin due to access control checks.
PASS Load an iframe that has Cross-Origin-Resource-Policy header
Modified: trunk/LayoutTests/http/wpt/cross-origin-resource-policy/iframe-loads.html (232308 => 232309)
--- trunk/LayoutTests/http/wpt/cross-origin-resource-policy/iframe-loads.html 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/LayoutTests/http/wpt/cross-origin-resource-policy/iframe-loads.html 2018-05-30 20:44:08 UTC (rev 232309)
@@ -21,7 +21,7 @@
}
promise_test(async() => {
- const url = "" + "resources/iframe.py?corp=same";
+ const url = "" + "resources/iframe.py?corp=same-origin";
await new Promise((resolve, reject) => {
return fetch(url, { mode: "no-cors" }).then(reject, resolve);
Modified: trunk/LayoutTests/http/wpt/cross-origin-resource-policy/image-loads-expected.txt (232308 => 232309)
--- trunk/LayoutTests/http/wpt/cross-origin-resource-policy/image-loads-expected.txt 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/LayoutTests/http/wpt/cross-origin-resource-policy/image-loads-expected.txt 2018-05-30 20:44:08 UTC (rev 232309)
@@ -1,12 +1,12 @@
-CONSOLE MESSAGE: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/image.py?corp=same&acao=* because it violates the resource's Cross-Origin-Resource-Policy response header.
-CONSOLE MESSAGE: Cannot load image http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/image.py?corp=same&acao=* due to access control checks.
+CONSOLE MESSAGE: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/image.py?corp=same-origin&acao=* because it violates the resource's Cross-Origin-Resource-Policy response header.
+CONSOLE MESSAGE: Cannot load image http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/image.py?corp=same-origin&acao=* due to access control checks.
CONSOLE MESSAGE: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/image.py?corp=same-site&acao=* because it violates the resource's Cross-Origin-Resource-Policy response header.
CONSOLE MESSAGE: Cannot load image http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/image.py?corp=same-site&acao=* due to access control checks.
-PASS Same-origin image load with a 'Cross-Origin-Resource-Policy: same' response header.
+PASS Same-origin image load with a 'Cross-Origin-Resource-Policy: same-origin' response header.
PASS Same-origin image load with a 'Cross-Origin-Resource-Policy: same-site' response header.
-PASS Cross-origin cors image load with a 'Cross-Origin-Resource-Policy: same' response header.
+PASS Cross-origin cors image load with a 'Cross-Origin-Resource-Policy: same-origin' response header.
PASS Cross-origin cors image load with a 'Cross-Origin-Resource-Policy: same-site' response header.
-PASS Cross-origin no-cors image load with a 'Cross-Origin-Resource-Policy: same' response header.
+PASS Cross-origin no-cors image load with a 'Cross-Origin-Resource-Policy: same-origin' response header.
PASS Cross-origin no-cors image load with a 'Cross-Origin-Resource-Policy: same-site' response header.
Modified: trunk/LayoutTests/http/wpt/cross-origin-resource-policy/image-loads.html (232308 => 232309)
--- trunk/LayoutTests/http/wpt/cross-origin-resource-policy/image-loads.html 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/LayoutTests/http/wpt/cross-origin-resource-policy/image-loads.html 2018-05-30 20:44:08 UTC (rev 232309)
@@ -30,20 +30,20 @@
}, title)
}
-title = "Same-origin image load with a 'Cross-Origin-Resource-Policy: same' response header.";
-loadImage("./resources/image.py?corp=same", ok);
+title = "Same-origin image load with a 'Cross-Origin-Resource-Policy: same-origin' response header.";
+loadImage("./resources/image.py?corp=same-origin", ok);
title = "Same-origin image load with a 'Cross-Origin-Resource-Policy: same-site' response header.";
loadImage("./resources/image.py?corp=same-site", ok);
-title = "Cross-origin cors image load with a 'Cross-Origin-Resource-Policy: same' response header.";
-loadImage(remoteBaseURL + "resources/image.py?corp=same&acao=*", ok, "anonymous");
+title = "Cross-origin cors image load with a 'Cross-Origin-Resource-Policy: same-origin' response header.";
+loadImage(remoteBaseURL + "resources/image.py?corp=same-origin&acao=*", ok, "anonymous");
title = "Cross-origin cors image load with a 'Cross-Origin-Resource-Policy: same-site' response header.";
loadImage(remoteBaseURL + "resources/image.py?corp=same-site&acao=*", ok, "anonymous");
-title = "Cross-origin no-cors image load with a 'Cross-Origin-Resource-Policy: same' response header.";
-loadImage(remoteBaseURL + "resources/image.py?corp=same&acao=*", ko);
+title = "Cross-origin no-cors image load with a 'Cross-Origin-Resource-Policy: same-origin' response header.";
+loadImage(remoteBaseURL + "resources/image.py?corp=same-origin&acao=*", ko);
title = "Cross-origin no-cors image load with a 'Cross-Origin-Resource-Policy: same-site' response header.";
loadImage(remoteBaseURL + "resources/image.py?corp=same-site&acao=*", ko);
Modified: trunk/LayoutTests/http/wpt/cross-origin-resource-policy/script-loads-expected.txt (232308 => 232309)
--- trunk/LayoutTests/http/wpt/cross-origin-resource-policy/script-loads-expected.txt 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/LayoutTests/http/wpt/cross-origin-resource-policy/script-loads-expected.txt 2018-05-30 20:44:08 UTC (rev 232309)
@@ -1,12 +1,12 @@
-CONSOLE MESSAGE: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/script.py?corp=same&acao=* because it violates the resource's Cross-Origin-Resource-Policy response header.
+CONSOLE MESSAGE: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/script.py?corp=same-origin&acao=* because it violates the resource's Cross-Origin-Resource-Policy response header.
CONSOLE MESSAGE: Cross-origin script load denied by Cross-Origin Resource Sharing policy.
CONSOLE MESSAGE: Cancelled load to http://127.0.0.1:8800/WebKit/cross-origin-resource-policy/resources/script.py?corp=same-site&acao=* because it violates the resource's Cross-Origin-Resource-Policy response header.
CONSOLE MESSAGE: Cross-origin script load denied by Cross-Origin Resource Sharing policy.
-PASS Same-origin script load with a 'Cross-Origin-Resource-Policy: same' response header.
+PASS Same-origin script load with a 'Cross-Origin-Resource-Policy: same-origin' response header.
PASS Same-origin script load with a 'Cross-Origin-Resource-Policy: same-site' response header.
-PASS Cross-origin cors script load with a 'Cross-Origin-Resource-Policy: same' response header.
+PASS Cross-origin cors script load with a 'Cross-Origin-Resource-Policy: same-origin' response header.
PASS Cross-origin cors script load with a 'Cross-Origin-Resource-Policy: same-site' response header.
-PASS Cross-origin no-cors script load with a 'Cross-Origin-Resource-Policy: same' response header.
+PASS Cross-origin no-cors script load with a 'Cross-Origin-Resource-Policy: same-origin' response header.
PASS Cross-origin no-cors script load with a 'Cross-Origin-Resource-Policy: same-site' response header.
Modified: trunk/LayoutTests/http/wpt/cross-origin-resource-policy/script-loads.html (232308 => 232309)
--- trunk/LayoutTests/http/wpt/cross-origin-resource-policy/script-loads.html 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/LayoutTests/http/wpt/cross-origin-resource-policy/script-loads.html 2018-05-30 20:44:08 UTC (rev 232309)
@@ -28,20 +28,20 @@
}, title);
}
-title = "Same-origin script load with a 'Cross-Origin-Resource-Policy: same' response header.";
-loadScript("./resources/script.py?corp=same", ok);
+title = "Same-origin script load with a 'Cross-Origin-Resource-Policy: same-origin' response header.";
+loadScript("./resources/script.py?corp=same-origin", ok);
title = "Same-origin script load with a 'Cross-Origin-Resource-Policy: same-site' response header.";
loadScript("./resources/script.py?corp=same-site", ok);
-title = "Cross-origin cors script load with a 'Cross-Origin-Resource-Policy: same' response header.";
-loadScript(remoteBaseURL + "resources/script.py?corp=same&acao=*", ok, "anonymous");
+title = "Cross-origin cors script load with a 'Cross-Origin-Resource-Policy: same-origin' response header.";
+loadScript(remoteBaseURL + "resources/script.py?corp=same-origin&acao=*", ok, "anonymous");
title = "Cross-origin cors script load with a 'Cross-Origin-Resource-Policy: same-site' response header.";
loadScript(remoteBaseURL + "resources/script.py?corp=same-site&acao=*", ok, "anonymous");
-title = "Cross-origin no-cors script load with a 'Cross-Origin-Resource-Policy: same' response header.";
-loadScript(remoteBaseURL + "resources/script.py?corp=same&acao=*", ko);
+title = "Cross-origin no-cors script load with a 'Cross-Origin-Resource-Policy: same-origin' response header.";
+loadScript(remoteBaseURL + "resources/script.py?corp=same-origin&acao=*", ko);
title = "Cross-origin no-cors script load with a 'Cross-Origin-Resource-Policy: same-site' response header.";
loadScript(remoteBaseURL + "resources/script.py?corp=same-site&acao=*", ko);
Modified: trunk/Source/WebCore/ChangeLog (232308 => 232309)
--- trunk/Source/WebCore/ChangeLog 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/Source/WebCore/ChangeLog 2018-05-30 20:44:08 UTC (rev 232309)
@@ -1,3 +1,16 @@
+2018-05-30 Youenn Fablet <[email protected]>
+
+ Rename CrossOriginResourcePolicy same to same-origin
+ https://bugs.webkit.org/show_bug.cgi?id=186080
+
+ Reviewed by Chris Dumez.
+
+ Covered by updated tests.
+
+ * platform/network/HTTPParsers.cpp:
+ (WebCore::parseCrossOriginResourcePolicyHeader):
+ * platform/network/HTTPParsers.h:
+
2018-05-30 Aditya Keerthi <[email protected]>
Fix the ENABLE(DATALIST_ELEMENT) build
Modified: trunk/Source/WebCore/platform/network/HTTPParsers.cpp (232308 => 232309)
--- trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2018-05-30 20:44:08 UTC (rev 232309)
@@ -904,8 +904,8 @@
if (strippedHeader.isEmpty())
return CrossOriginResourcePolicy::None;
- if (equalLettersIgnoringASCIICase(strippedHeader, "same"))
- return CrossOriginResourcePolicy::Same;
+ if (equalLettersIgnoringASCIICase(strippedHeader, "same-origin"))
+ return CrossOriginResourcePolicy::SameOrigin;
if (equalLettersIgnoringASCIICase(strippedHeader, "same-site"))
return CrossOriginResourcePolicy::SameSite;
Modified: trunk/Source/WebCore/platform/network/HTTPParsers.h (232308 => 232309)
--- trunk/Source/WebCore/platform/network/HTTPParsers.h 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.h 2018-05-30 20:44:08 UTC (rev 232309)
@@ -66,7 +66,7 @@
enum class CrossOriginResourcePolicy {
None,
- Same,
+ SameOrigin,
SameSite,
Invalid
};
Modified: trunk/Source/WebKit/ChangeLog (232308 => 232309)
--- trunk/Source/WebKit/ChangeLog 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/Source/WebKit/ChangeLog 2018-05-30 20:44:08 UTC (rev 232309)
@@ -1,3 +1,13 @@
+2018-05-30 Youenn Fablet <[email protected]>
+
+ Rename CrossOriginResourcePolicy same to same-origin
+ https://bugs.webkit.org/show_bug.cgi?id=186080
+
+ Reviewed by Chris Dumez.
+
+ * NetworkProcess/NetworkLoadChecker.cpp:
+ (WebKit::NetworkLoadChecker::shouldCrossOriginResourcePolicyPolicyCancelLoad):
+
2018-05-30 David Kilzer <[email protected]>
[iOS] -[WKFullScreenViewController viewWillAppear:] should call [super viewWillAppeear:]
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp (232308 => 232309)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp 2018-05-30 20:44:08 UTC (rev 232309)
@@ -141,7 +141,7 @@
case CrossOriginResourcePolicy::None:
case CrossOriginResourcePolicy::Invalid:
return false;
- case CrossOriginResourcePolicy::Same:
+ case CrossOriginResourcePolicy::SameOrigin:
return true;
case CrossOriginResourcePolicy::SameSite: {
#if ENABLE(PUBLIC_SUFFIX_LIST)
Modified: trunk/Tools/ChangeLog (232308 => 232309)
--- trunk/Tools/ChangeLog 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/Tools/ChangeLog 2018-05-30 20:44:08 UTC (rev 232309)
@@ -1,3 +1,13 @@
+2018-05-30 Youenn Fablet <[email protected]>
+
+ Rename CrossOriginResourcePolicy same to same-origin
+ https://bugs.webkit.org/show_bug.cgi?id=186080
+
+ Reviewed by Chris Dumez.
+
+ * TestWebKitAPI/Tests/WebCore/HTTPParsers.cpp:
+ (TestWebKitAPI::TEST):
+
2018-05-30 Ms2ger <[email protected]>
[GTK] Unreviewed test gardening
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/HTTPParsers.cpp (232308 => 232309)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/HTTPParsers.cpp 2018-05-30 20:41:07 UTC (rev 232308)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/HTTPParsers.cpp 2018-05-30 20:44:08 UTC (rev 232309)
@@ -37,10 +37,10 @@
EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("") == CrossOriginResourcePolicy::None);
EXPECT_TRUE(parseCrossOriginResourcePolicyHeader(" ") == CrossOriginResourcePolicy::None);
- EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("same") == CrossOriginResourcePolicy::Same);
- EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("Same") == CrossOriginResourcePolicy::Same);
- EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("SAME") == CrossOriginResourcePolicy::Same);
- EXPECT_TRUE(parseCrossOriginResourcePolicyHeader(" same ") == CrossOriginResourcePolicy::Same);
+ EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("same-origin") == CrossOriginResourcePolicy::SameOrigin);
+ EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("Same-Origin") == CrossOriginResourcePolicy::SameOrigin);
+ EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("SAME-ORIGIN") == CrossOriginResourcePolicy::SameOrigin);
+ EXPECT_TRUE(parseCrossOriginResourcePolicyHeader(" same-orIGIN ") == CrossOriginResourcePolicy::SameOrigin);
EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("same-site") == CrossOriginResourcePolicy::SameSite);
EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("Same-Site") == CrossOriginResourcePolicy::SameSite);
@@ -47,7 +47,8 @@
EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("SAME-SITE") == CrossOriginResourcePolicy::SameSite);
EXPECT_TRUE(parseCrossOriginResourcePolicyHeader(" same-site ") == CrossOriginResourcePolicy::SameSite);
- EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("zame") == CrossOriginResourcePolicy::Invalid);
+ EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("SameOrigin") == CrossOriginResourcePolicy::Invalid);
+ EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("zameorigin") == CrossOriginResourcePolicy::Invalid);
EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("samesite") == CrossOriginResourcePolicy::Invalid);
EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("same site") == CrossOriginResourcePolicy::Invalid);
EXPECT_TRUE(parseCrossOriginResourcePolicyHeader("same–site") == CrossOriginResourcePolicy::Invalid);
