Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / LayoutTests / http / tests / inspector / network / network-initiator.html
diff --git a/src/third_party/WebKit/LayoutTests/http/tests/inspector/network/network-initiator.html b/src/third_party/WebKit/LayoutTests/http/tests/inspector/network/network-initiator.html

index 00b0a87..6a59be1 100644 (file)
--- a/src/third_party/WebKit/LayoutTests/http/tests/inspector/network/network-initiator.html
+++ b/src/third_party/WebKit/LayoutTests/http/tests/inspector/network/network-initiator.html
@@ -1,6 +1,5 @@
  <html>
  <head>
-<link href="resources/initiator.css" rel="stylesheet" type="text/css">
  <script src="../inspector-test.js"></script>
  <script src="../network-test.js"></script>
  <script>
@@ -19,24 +18,14 @@ function addClassToDivStep2()
  
  function loadData()
  {
-    var xhr = new XMLHttpRequest();
-    xhr.onreadystatechange = function()
-    {
-        if (xhr.readyState === XMLHttpRequest.DONE)
-            resourceLoaded();
-    };
-    xhr.open("GET", "resources/resource.php?type=image&random=1&size=400", true);
-    xhr.send(null);
-}
-
-function resourceLoaded()
-{
-    console.log("Done.");
+    var iframe = document.createElement("iframe");
+    iframe.src = "resources/network-initiator-frame.html";
+    document.body.appendChild(iframe);
  }
  
  var test = function()
  {
-    InspectorTest.hardReloadPage(step2);
+    step2();
  
      function findRequestByURL(url)
      {
@@ -71,8 +60,13 @@ var test = function()
  
      function step3()
      {
-        function dumpInitiator(request)
+        function dumpInitiator(url)
          {
+            var request = findRequestByURL(new RegExp(url.replace(".", "\\.")));
+            if (!request) {
+                InspectorTest.addResult(url + " NOT FOUND");
+                return;
+            }
              var initiator = request.initiator;
              InspectorTest.addResult(request.url + ": " + initiator.type);
              if (initiator.url)
@@ -89,12 +83,12 @@ var test = function()
              }
          }
  
-        dumpInitiator(findRequestByURL(/initiator\.css/));
-        dumpInitiator(findRequestByURL(/size=100/));
-        //dumpInitiator(findRequestByURL(/size=200/));
-        //dumpInitiator(findRequestByURL(/size=300/));
-        dumpInitiator(findRequestByURL(/size=400/));
-        dumpInitiator(findRequestByURL(/style\.css/));
+        dumpInitiator("initiator.css");
+        dumpInitiator("size=100");
+        //dumpInitiator("size=200");
+        //dumpInitiator("size=300");
+        dumpInitiator("size=400");
+        dumpInitiator("style.css");
          InspectorTest.completeTest();
      }
  }
@@ -104,9 +98,5 @@ var test = function()
  <body onload="runTest()">
  <p>Tests resources initiator for images initiated by IMG tag, static CSS, CSS class added from JavaScript and XHR.</p>
  <a href="https://bugs.webkit.org/show_bug.cgi?id=65105">Bug 65105</a>
-<img src="resources/resource.php?type=image&random=1&size=100">
-<div class="image-background">This div has background image set from CSS.</div>
-<div id="div-without-class">This div will have background image set from JavaScript.</div>
-<style>@import "resources/style.css";</style>
  </body>
  </html>