Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Unified Diff: LayoutTests/http/tests/security/resources/video-cross-origin-allow.php

Issue 80263004: Test Canvas tainting and WebGL video textures (CORS fetched.) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased + adjust expected output Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/http/tests/security/resources/video-cross-origin-allow.php
diff --git a/LayoutTests/http/tests/security/resources/video-cross-origin-allow.php b/LayoutTests/http/tests/security/resources/video-cross-origin-allow.php
index 8ec4d67bdfceeb226d1aa75b51e3a0a339b02d62..056ddb51727aa1fa5648743b24aa8fabfbf4e740 100644
--- a/LayoutTests/http/tests/security/resources/video-cross-origin-allow.php
+++ b/LayoutTests/http/tests/security/resources/video-cross-origin-allow.php
@@ -1,18 +1,16 @@
<?php
-if (isset($_GET['no-preflight']) && $_SERVER['REQUEST_METHOD'] == "OPTIONS") {
+if ($_SERVER['REQUEST_METHOD'] == "OPTIONS") {
+ # No preflights should happen.
echo "FAIL";
exit;
}
-header("Access-Control-Allow-Origin: *");
-
-if ($_SERVER['REQUEST_METHOD'] == "OPTIONS") {
- header("Access-Control-Allow-Methods: GET");
- header("Access-Control-Allow-Headers: origin, accept-encoding, referer, range");
- exit;
+if (isset($_GET['with_credentials'])) {
+ header("Access-Control-Allow-Origin: http://127.0.0.1:8000");
+ header("Access-Control-Allow-Credentials: true");
+} else {
+ header("Access-Control-Allow-Origin: *");
}
-
@include("../../media/resources/serve-video.php");
-
?>
« no previous file with comments | « no previous file | LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698