Back out changeset 5029ca635908 (bug 1194848) because it depends on a backed out bug
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 21 Oct 2015 21:42:46 -0700
changeset 268891 dc161b1cddbf05e13303768d3df0db36a725333e
parent 268890 a2e2d5b8b3f713a4fd1ad348fa8c3b3979d6cc8b
child 268892 0513d651719bcded74dcd18967f241e8dd16a755
child 268978 76bd0c01d72e64ca4f261ffdb2652a91f961e930
push id66963
push userphilringnalda@gmail.com
push dateThu, 22 Oct 2015 04:43:01 +0000
treeherdermozilla-inbound@dc161b1cddbf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1194848
milestone44.0a1
backs out5029ca635908316185400ab96db137dd2b2690f9
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out changeset 5029ca635908 (bug 1194848) because it depends on a backed out bug CLOSED TREE
testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-canvas-tainting.https.html.ini
testing/web-platform/mozilla/tests/service-workers/service-worker/fetch-canvas-tainting.https.html
testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-canvas-tainting-iframe.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-canvas-tainting.https.html.ini
@@ -0,0 +1,6 @@
+[fetch-canvas-tainting.https.html]
+  type: testharness
+  expected: TIMEOUT
+  [Verify canvas tainting of fetched image in a Service Worker]
+    expected: TIMEOUT
+
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/fetch-canvas-tainting.https.html
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/fetch-canvas-tainting.https.html
@@ -6,33 +6,33 @@
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <body>
 <script>
 async_test(function(t) {
     var SCOPE = 'resources/fetch-canvas-tainting-iframe.html';
     var SCRIPT = 'resources/fetch-rewrite-worker.js';
     var host_info = get_host_info();
 
-    login_https(t)
+    login(t)
       .then(function() {
           return service_worker_unregister_and_register(t, SCRIPT, SCOPE);
         })
       .then(function(registration) {
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(function() { return with_iframe(SCOPE); })
       .then(function(frame) {
           return new Promise(function(resolve, reject) {
               var channel = new MessageChannel();
               channel.port1.onmessage = t.step_func(function(e) {
                   assert_equals(e.data.results, 'finish');
                   frame.remove();
                   service_worker_unregister_and_done(t, SCOPE);
                 });
               frame.contentWindow.postMessage({},
-                                              host_info['HTTPS_ORIGIN'],
+                                              host_info['HTTP_ORIGIN'],
                                               [channel.port2]);
             });
         })
       .catch(unreached_rejection(t));
   }, 'Verify canvas tainting of fetched image in a Service Worker');
 </script>
 </body>
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-canvas-tainting-iframe.html
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-canvas-tainting-iframe.html
@@ -46,18 +46,18 @@ function create_test_promise(url, cross_
                    expected_result + ' but ' + result);
           }
         })
     });
 }
 
 window.addEventListener('message', function(evt) {
     var port = evt.ports[0];
-    var image_url = host_info['HTTPS_ORIGIN'] + image_path;
-    var remote_image_url = host_info['HTTPS_REMOTE_ORIGIN'] + image_path;
+    var image_url = host_info['HTTP_ORIGIN'] + image_path;
+    var remote_image_url = host_info['HTTP_REMOTE_ORIGIN'] + image_path;
     Promise.all([
         // Reject tests
         create_test_promise(image_url + '&reject', '', LOAD_ERROR),
         create_test_promise(image_url + '&reject', 'anonymous', LOAD_ERROR),
         create_test_promise(
             image_url + '&reject', 'use-credentials', LOAD_ERROR),
         // Fallback tests
         create_test_promise(
@@ -68,31 +68,31 @@ window.addEventListener('message', funct
             remote_image_url + '&ignore',
             '',
             TAINTED),
         create_test_promise(
             remote_image_url + '&ignore',
             'anonymous',
             LOAD_ERROR),
         create_test_promise(
-            remote_image_url + '&ACAOrigin=' + host_info['HTTPS_ORIGIN'] +
+            remote_image_url + '&ACAOrigin=' + host_info['HTTP_ORIGIN'] +
             '&ignore',
             'anonymous',
             NOT_TAINTED),
         create_test_promise(
             remote_image_url + '&ignore',
             'use-credentials',
             LOAD_ERROR),
         create_test_promise(
-            remote_image_url + '&ACAOrigin=' + host_info['HTTPS_ORIGIN'] +
+            remote_image_url + '&ACAOrigin=' + host_info['HTTP_ORIGIN'] +
             '&ignore',
             'use-credentials',
             LOAD_ERROR),
         create_test_promise(
-            remote_image_url + '&ACAOrigin=' + host_info['HTTPS_ORIGIN'] +
+            remote_image_url + '&ACAOrigin=' + host_info['HTTP_ORIGIN'] +
             '&ACACredentials=true&ignore',
             'use-credentials',
             NOT_TAINTED),
 
         // Credential test (fallback)
         create_test_promise(
             image_url + '&Auth&ignore',
             '',
@@ -105,22 +105,22 @@ window.addEventListener('message', funct
             remote_image_url + '&Auth&ignore',
             'anonymous',
             LOAD_ERROR),
         create_test_promise(
             remote_image_url + '&Auth&ignore',
             'use-credentials',
             LOAD_ERROR),
         create_test_promise(
-            remote_image_url + '&Auth&ACAOrigin=' + host_info['HTTPS_ORIGIN'] +
+            remote_image_url + '&Auth&ACAOrigin=' + host_info['HTTP_ORIGIN'] +
             '&ignore',
             'use-credentials',
             LOAD_ERROR),
         create_test_promise(
-            remote_image_url + '&Auth&ACAOrigin=' + host_info['HTTPS_ORIGIN'] +
+            remote_image_url + '&Auth&ACAOrigin=' + host_info['HTTP_ORIGIN'] +
             '&ACACredentials=true&ignore',
             'use-credentials',
             NOT_TAINTED),
 
         // Basic response
         create_test_promise(
             image_url +
             '&mode=same-origin&url=' + encodeURIComponent(image_url),
@@ -184,74 +184,68 @@ window.addEventListener('message', funct
             'use-credentials',
             LOAD_ERROR),
         
         // CORS response
         create_test_promise(
             image_url +
             '&mode=cors&url=' +
             encodeURIComponent(remote_image_url +
-                               '&ACAOrigin=' + host_info['HTTPS_ORIGIN']),
+                               '&ACAOrigin=' + host_info['HTTP_ORIGIN']),
             '',
-            TAINTED), // We expect TAINTED since the default origin behavior here
-                      // is taint, and it doesn't matter what kind of fetch the
-                      // SW performs.
+            NOT_TAINTED),
         create_test_promise(
             image_url +
             '&mode=cors&url=' +
             encodeURIComponent(remote_image_url +
-                               '&ACAOrigin=' + host_info['HTTPS_ORIGIN']),
+                               '&ACAOrigin=' + host_info['HTTP_ORIGIN']),
             'anonymous',
             NOT_TAINTED),
         create_test_promise(
             image_url +
             '&mode=cors&url=' +
             encodeURIComponent(remote_image_url +
-                               '&ACAOrigin=' + host_info['HTTPS_ORIGIN']),
+                               '&ACAOrigin=' + host_info['HTTP_ORIGIN']),
             'use-credentials',
-            LOAD_ERROR), // We expect LOAD_ERROR since the server doesn't respond
-                         // with an Access-Control-Allow-Credentials header.
+            NOT_TAINTED),
         create_test_promise(
             image_url +
             '&mode=cors&url=' +
             encodeURIComponent(
                 remote_image_url +
-                '&ACACredentials=true&ACAOrigin=' + host_info['HTTPS_ORIGIN']),
+                '&ACACredentials=true&ACAOrigin=' + host_info['HTTP_ORIGIN']),
             'use-credentials',
             NOT_TAINTED),
         create_test_promise(
             remote_image_url +
             '&mode=cors&url=' +
             encodeURIComponent(remote_image_url +
-                               '&ACAOrigin=' + host_info['HTTPS_ORIGIN']),
+                               '&ACAOrigin=' + host_info['HTTP_ORIGIN']),
             '',
-            TAINTED), // We expect TAINTED since the default origin behavior here
-                      // is taint, and it doesn't matter what kind of fetch the
-                      // SW performs.
+            NOT_TAINTED),
         create_test_promise(
             remote_image_url +
             '&mode=cors&url=' +
             encodeURIComponent(remote_image_url +
-                               '&ACAOrigin=' + host_info['HTTPS_ORIGIN']),
+                               '&ACAOrigin=' + host_info['HTTP_ORIGIN']),
             'anonymous',
             NOT_TAINTED),
         create_test_promise(
             remote_image_url +
             '&mode=cors&url=' +
             encodeURIComponent(remote_image_url +
-                               '&ACAOrigin=' + host_info['HTTPS_ORIGIN']),
+                               '&ACAOrigin=' + host_info['HTTP_ORIGIN']),
             'use-credentials',
-            LOAD_ERROR), // We expect LOAD_ERROR since the server doesn't respond
-                         // with an Access-Control-Allow-Credentials header.
+            NOT_TAINTED),
         create_test_promise(
             remote_image_url +
             '&mode=cors&url=' +
             encodeURIComponent(
                 remote_image_url +
-                '&ACACredentials=true&ACAOrigin=' + host_info['HTTPS_ORIGIN']),
+                '&ACACredentials=true&ACAOrigin=' + host_info['HTTP_ORIGIN']),
             'use-credentials',
             NOT_TAINTED)
       ])
       .then(function() {
           port.postMessage({results: 'finish'});
         })
       .catch(function(e) {
           port.postMessage({results: 'failure:' + e});