Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / LayoutTests / http / tests / serviceworker / resources / fetch-mixed-content-iframe.html
diff --git a/src/third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-mixed-content-iframe.html b/src/third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-mixed-content-iframe.html

index 96ca60d..0df3ee6 100644 (file)
--- a/src/third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-mixed-content-iframe.html
+++ b/src/third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-mixed-content-iframe.html
@@ -1,7 +1,8 @@
  <!DOCTYPE html>
  <script src="test-helpers.js?pipe=sub"></script>
  <script>
-var SCOPE = 'fetch-mixed-content-iframe-inscope.html';
+var params = get_query_params(location.href);
+var SCOPE = 'fetch-mixed-content-iframe-inscope-to-' + params['target'] + '.html';
  var URL = 'fetch-rewrite-worker.js';
  var host_info = get_host_info();
  
@@ -24,7 +25,11 @@ navigator.serviceWorker.getRegistration(SCOPE)
      })
    .then(function(worker) {
        worker.addEventListener('statechange', on_state_change);
-    });
+    })
+  .catch(function(reason) {
+      window.parent.postMessage({results: 'FAILURE: ' + reason.message},
+                                host_info['HTTP_ORIGIN']);
+     });
  
  function on_state_change(event) {
    if (event.target.state != 'activated')
@@ -42,6 +47,24 @@ function on_message(e) {
        })
      .then(function() {
        window.parent.postMessage(e.data, host_info['HTTP_ORIGIN']);
+    })
+    .catch(function(reason) {
+        window.parent.postMessage({results: 'FAILURE: ' + reason.message},
+                                  host_info['HTTP_ORIGIN']);
+     });
+}
+
+function get_query_params(url) {
+  var search = (new URL(url)).search;
+  if (!search) {
+    return {};
+  }
+  var ret = {};
+  var params = search.substring(1).split('&');
+  params.forEach(function(param) {
+      var element = param.split('=');
+      ret[decodeURIComponent(element[0])] = decodeURIComponent(element[1]);
      });
+  return ret;
  }
  </script>