[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
yurys at chromium.org
yurys at chromium.org
Fri Feb 26 22:17:50 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 9806ee7506fe8868f987fcc3aab363b8ffbd4ce4
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 11 18:55:48 2010 +0000
2010-02-11 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
Test that Web Inspector can inspect styles of elements in iframe from a domain
different from main frame domain.
inspector-tests.js moved to LayoutTests/http/tests/inspector because it can
be referenced by relative path from LayoutTests/inspector but not vice versa
(html files served from LayoutTests/http/tests cannot refer it because WebKit
tests httpd doesn't serve content not under LayoutTests/http).
https://bugs.webkit.org/show_bug.cgi?id=31587
* http/tests/inspector/inspect-iframe-from-different-domain-expected.txt: Added.
* http/tests/inspector/inspect-iframe-from-different-domain.html: Added.
* http/tests/inspector/inspector-test.js: Renamed from LayoutTests/inspector/inspector-test.js.
(onload):
(evaluateInWebInspector):
(notifyDone):
(output):
(didEvaluateForTestInFrontend):
* http/tests/inspector/resources/iframe-from-different-domain-data.html: Added.
* inspector/console-clear.html:
* inspector/console-dir.html:
* inspector/console-dirxml.html:
* inspector/console-format-collections-expected.txt:
* inspector/console-format-collections.html:
* inspector/console-format.html:
* inspector/console-log-before-inspector-open.html:
* inspector/console-tests.html:
* inspector/cookie-resource-match.html:
* inspector/elements-img-tooltip.html:
* inspector/elements-panel-rewrite-href-expected.txt:
* inspector/elements-panel-rewrite-href.html:
* inspector/elements-panel-selection-on-refresh.html:
* inspector/elements-panel-structure.html:
* inspector/evaluate-in-frontend.html:
* inspector/inspected-objects-not-overriden.html:
* inspector/styles-iframe.html:
* inspector/syntax-highlight-css.html:
* inspector/syntax-highlight-javascript.html:
* inspector/timeline-enum-stability.html:
* inspector/timeline-event-dispatch.html:
* inspector/timeline-layout.html:
* inspector/timeline-mark-timeline.html:
* inspector/timeline-network-resource.html:
* inspector/timeline-paint.html:
* inspector/timeline-parse-html.html:
* inspector/timeline-recalculate-styles.html:
* inspector/timeline-script-tag-1.html:
* inspector/timeline-script-tag-2.html:
* inspector/timeline-trivial.html:
* platform/qt/Skipped:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54659 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 54f7367..f068213 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,58 @@
+2010-02-11 Yury Semikhatsky <yurys at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Test that Web Inspector can inspect styles of elements in iframe from a domain
+ different from main frame domain.
+
+ inspector-tests.js moved to LayoutTests/http/tests/inspector because it can
+ be referenced by relative path from LayoutTests/inspector but not vice versa
+ (html files served from LayoutTests/http/tests cannot refer it because WebKit
+ tests httpd doesn't serve content not under LayoutTests/http).
+
+ https://bugs.webkit.org/show_bug.cgi?id=31587
+
+ * http/tests/inspector/inspect-iframe-from-different-domain-expected.txt: Added.
+ * http/tests/inspector/inspect-iframe-from-different-domain.html: Added.
+ * http/tests/inspector/inspector-test.js: Renamed from LayoutTests/inspector/inspector-test.js.
+ (onload):
+ (evaluateInWebInspector):
+ (notifyDone):
+ (output):
+ (didEvaluateForTestInFrontend):
+ * http/tests/inspector/resources/iframe-from-different-domain-data.html: Added.
+ * inspector/console-clear.html:
+ * inspector/console-dir.html:
+ * inspector/console-dirxml.html:
+ * inspector/console-format-collections-expected.txt:
+ * inspector/console-format-collections.html:
+ * inspector/console-format.html:
+ * inspector/console-log-before-inspector-open.html:
+ * inspector/console-tests.html:
+ * inspector/cookie-resource-match.html:
+ * inspector/elements-img-tooltip.html:
+ * inspector/elements-panel-rewrite-href-expected.txt:
+ * inspector/elements-panel-rewrite-href.html:
+ * inspector/elements-panel-selection-on-refresh.html:
+ * inspector/elements-panel-structure.html:
+ * inspector/evaluate-in-frontend.html:
+ * inspector/inspected-objects-not-overriden.html:
+ * inspector/styles-iframe.html:
+ * inspector/syntax-highlight-css.html:
+ * inspector/syntax-highlight-javascript.html:
+ * inspector/timeline-enum-stability.html:
+ * inspector/timeline-event-dispatch.html:
+ * inspector/timeline-layout.html:
+ * inspector/timeline-mark-timeline.html:
+ * inspector/timeline-network-resource.html:
+ * inspector/timeline-paint.html:
+ * inspector/timeline-parse-html.html:
+ * inspector/timeline-recalculate-styles.html:
+ * inspector/timeline-script-tag-1.html:
+ * inspector/timeline-script-tag-2.html:
+ * inspector/timeline-trivial.html:
+ * platform/qt/Skipped:
+
2010-02-11 Andras Becsi <abecsi at webkit.org>
Rubber-stamped by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain-expected.txt b/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain-expected.txt
new file mode 100644
index 0000000..e8fc92d
--- /dev/null
+++ b/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain-expected.txt
@@ -0,0 +1,5 @@
+
+Tests that style properties of elements in iframes loaded from domain different from the main document domain can be inspected. See bug 31587.
+
+background = green
+
diff --git a/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain.html b/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain.html
new file mode 100644
index 0000000..033d3d5
--- /dev/null
+++ b/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain.html
@@ -0,0 +1,96 @@
+<html>
+<head>
+<title>Inspect style in iframe from different domain.</title>
+<script src="inspector-test.js"></script>
+<script type="text/javascript" charset="utf-8">
+
+function doit()
+{
+ function callback(result)
+ {
+ output(result);
+ notifyDone();
+ }
+ evaluateInWebInspector("frontend_dumpIFrameBackground", callback);
+}
+
+function onIFrameLoad()
+{
+ onload();
+}
+
+// Frontend functions.
+
+function frontend_expandElementsTreeNode(elementsTreeNode, testController, callback)
+{
+ if (elementsTreeNode.expanded) {
+ callback();
+ return;
+ }
+ elementsTreeNode.expand();
+ testController.runAfterPendingDispatches(function() {
+ callback();
+ });
+}
+
+function frontend_expandDOMElementsTreePath(elementsTreeRoot, path, testController, callback)
+{
+ if (!path.length) {
+ callback(elementsTreeRoot);
+ return;
+ }
+ frontend_expandElementsTreeNode(elementsTreeRoot, testController, function() {
+ var children = elementsTreeRoot.children;
+ var child = elementsTreeRoot.children[path[0]];
+ if (!child) {
+ testController.notifyDone("Failed to expand node. Path = " + path);
+ return;
+ }
+ if (!child.representedObject) {
+ testController.notifyDone("Represented object is null. Path = " + path);
+ return;
+ }
+ var childNodeName = child.representedObject.nodeName;
+ if (childNodeName !== path[1]) {
+ testController.notifyDone("Unexpected child node name: " + childNodeName + ". Path = " + path);
+ return;
+ }
+ frontend_expandDOMElementsTreePath(child, path.slice(2), testController, callback);
+ });
+}
+
+function frontend_dumpIFrameBackground(testController)
+{
+ testController.waitUntilDone();
+ // Expand the iframe body and examine it.
+ frontend_expandDOMElementsTreePath(WebInspector.panels.elements.treeOutline, [0, "HTML", 1, "BODY", 0, "IFRAME", 0, "HTML", 1, "BODY"], testController, function(domElementsTreeNode) {
+ var domNode = domElementsTreeNode.representedObject;
+ // Set focus to the iframe body node and then check its style.
+ WebInspector.panels.elements.focusedDOMNode = domNode;
+ testController.runAfterPendingDispatches(function() {
+ for (var i = 0; i < domNode._matchedCSSRules.length; i++) {
+ var rule = domNode._matchedCSSRules[i];
+ if (rule.isUser || rule.isUserAgent)
+ continue;
+ var bg = rule.style.getShorthandValue("background");
+ if (bg) {
+ testController.notifyDone("background = " + bg);
+ return;
+ }
+ }
+ testController.notifyDone("Background property not found");
+ });
+ });
+}
+
+</script>
+</head>
+<body>
+ <iframe src="http://localhost:8000/inspector/resources/iframe-from-different-domain-data.html" id="receiver" onload="onIFrameLoad();"></iframe>
+ <p>
+ Tests that style properties of elements in iframes loaded from domain different from
+ the main document domain can be inspected.
+ See <a href="https://bugs.webkit.org/show_bug.cgi?id=31587">bug 31587</a>.
+ </p>
+</body>
+</html>
diff --git a/LayoutTests/inspector/inspector-test.js b/LayoutTests/http/tests/inspector/inspector-test.js
similarity index 100%
rename from LayoutTests/inspector/inspector-test.js
rename to LayoutTests/http/tests/inspector/inspector-test.js
diff --git a/LayoutTests/http/tests/inspector/resources/iframe-from-different-domain-data.html b/LayoutTests/http/tests/inspector/resources/iframe-from-different-domain-data.html
new file mode 100755
index 0000000..2366bbe
--- /dev/null
+++ b/LayoutTests/http/tests/inspector/resources/iframe-from-different-domain-data.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+<style type="text/css" media="screen">
+ body { background:green; }
+</style>
+</head>
+<body id="iframe-body">
+Inspect me.
+</body>
+</html>
diff --git a/LayoutTests/inspector/console-clear.html b/LayoutTests/inspector/console-clear.html
index 46fc140..ce51a7e 100644
--- a/LayoutTests/inspector/console-clear.html
+++ b/LayoutTests/inspector/console-clear.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="console-tests.js"></script>
<script>
diff --git a/LayoutTests/inspector/console-dir.html b/LayoutTests/inspector/console-dir.html
index 3b86e85..edd8d9e 100755
--- a/LayoutTests/inspector/console-dir.html
+++ b/LayoutTests/inspector/console-dir.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="console-tests.js"></script>
<script>
diff --git a/LayoutTests/inspector/console-dirxml.html b/LayoutTests/inspector/console-dirxml.html
index c9a8f7f..6067b46 100755
--- a/LayoutTests/inspector/console-dirxml.html
+++ b/LayoutTests/inspector/console-dirxml.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="console-tests.js"></script>
<script>
diff --git a/LayoutTests/inspector/console-format-collections-expected.txt b/LayoutTests/inspector/console-format-collections-expected.txt
index 6b2eaee..c7217bc 100644
--- a/LayoutTests/inspector/console-format-collections-expected.txt
+++ b/LayoutTests/inspector/console-format-collections-expected.txt
@@ -7,9 +7,9 @@ CONSOLE MESSAGE: line 35: [object NodeList]
Tests that console nicely formats HTML Collections and NodeLists.
console-format-collections.html:15[<select id="sel" name="sel">]
-console-format-collections.html:19[<script src="inspector-test.js">, <script src="console-tests.js">, <script>]
+console-format-collections.html:19[<script src="../http/tests/inspector/inspector-test.js">, <script src="console-tests.js">, <script>]
console-format-collections.html:23[<option value="1">one</option>, <option value="2">two</option>]
-console-format-collections.html:27[<html>, <head>, <script src="inspector-test.js">, <script src="console-tests.js">, <script>, <body onload="onload()">, <p> Tests that console nicely formats HTML Collections and NodeLists. </p>, <div style="display:none">, <form id="f">, <select id="sel" name="sel">, <option value="1">one</option>, <option value="2">two</option>, <input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">, <div id="output">]
+console-format-collections.html:27[<html>, <head>, <script src="../http/tests/inspector/inspector-test.js">, <script src="console-tests.js">, <script>, <body onload="onload()">, <p> Tests that console nicely formats HTML Collections and NodeLists. </p>, <div style="display:none">, <form id="f">, <select id="sel" name="sel">, <option value="1">one</option>, <option value="2">two</option>, <input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">, <div id="output">]
console-format-collections.html:31[<select id="sel" name="sel">, <input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">]
console-format-collections.html:35[<input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">]
diff --git a/LayoutTests/inspector/console-format-collections.html b/LayoutTests/inspector/console-format-collections.html
index 606b580..3111e09 100644
--- a/LayoutTests/inspector/console-format-collections.html
+++ b/LayoutTests/inspector/console-format-collections.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="console-tests.js"></script>
<script>
diff --git a/LayoutTests/inspector/console-format.html b/LayoutTests/inspector/console-format.html
index 0bbdbe7..fd4db88 100755
--- a/LayoutTests/inspector/console-format.html
+++ b/LayoutTests/inspector/console-format.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="console-tests.js"></script>
<script>
diff --git a/LayoutTests/inspector/console-log-before-inspector-open.html b/LayoutTests/inspector/console-log-before-inspector-open.html
index a8921f1..caa73e1 100644
--- a/LayoutTests/inspector/console-log-before-inspector-open.html
+++ b/LayoutTests/inspector/console-log-before-inspector-open.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="console-tests.js"></script>
<script>
diff --git a/LayoutTests/inspector/console-tests.html b/LayoutTests/inspector/console-tests.html
index 07b0b18..67a8180 100755
--- a/LayoutTests/inspector/console-tests.html
+++ b/LayoutTests/inspector/console-tests.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="console-tests.js"></script>
<script>
diff --git a/LayoutTests/inspector/cookie-resource-match.html b/LayoutTests/inspector/cookie-resource-match.html
index 8ee06d1..70874fb 100644
--- a/LayoutTests/inspector/cookie-resource-match.html
+++ b/LayoutTests/inspector/cookie-resource-match.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script>
function doit() {
diff --git a/LayoutTests/inspector/elements-img-tooltip.html b/LayoutTests/inspector/elements-img-tooltip.html
index da8302c..312b83c 100644
--- a/LayoutTests/inspector/elements-img-tooltip.html
+++ b/LayoutTests/inspector/elements-img-tooltip.html
@@ -1,7 +1,7 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="elements-tests.js"></script>
<script>
var EXPECTED_TOOLTIP_TEXT = "215 \xd7 174 pixels";
diff --git a/LayoutTests/inspector/elements-panel-rewrite-href-expected.txt b/LayoutTests/inspector/elements-panel-rewrite-href-expected.txt
index 4d8a417..a1532cd 100644
--- a/LayoutTests/inspector/elements-panel-rewrite-href-expected.txt
+++ b/LayoutTests/inspector/elements-panel-rewrite-href-expected.txt
@@ -2,6 +2,6 @@ Tests that src and href element targets are rewritten properly.
[,bogusSheet1.css]
[LayoutTests,inspector,bogusSheet2.css]
-[LayoutTests,inspector,inspector-test.js]
+[tests,inspector,inspector-test.js]
[LayoutTests,inspector,elements-tests.js]
diff --git a/LayoutTests/inspector/elements-panel-rewrite-href.html b/LayoutTests/inspector/elements-panel-rewrite-href.html
index 22a1029..8754cec 100644
--- a/LayoutTests/inspector/elements-panel-rewrite-href.html
+++ b/LayoutTests/inspector/elements-panel-rewrite-href.html
@@ -3,7 +3,7 @@
<head>
<link rel="stylesheet" src="/bogusSheet1.css">
<link rel="stylesheet" src="bogusSheet2.css">
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="elements-tests.js"></script>
<script>
diff --git a/LayoutTests/inspector/elements-panel-selection-on-refresh.html b/LayoutTests/inspector/elements-panel-selection-on-refresh.html
index 0980a97..7471723 100644
--- a/LayoutTests/inspector/elements-panel-selection-on-refresh.html
+++ b/LayoutTests/inspector/elements-panel-selection-on-refresh.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="elements-tests.js"></script>
<script>
diff --git a/LayoutTests/inspector/elements-panel-structure.html b/LayoutTests/inspector/elements-panel-structure.html
index 652d1e1..101d002 100755
--- a/LayoutTests/inspector/elements-panel-structure.html
+++ b/LayoutTests/inspector/elements-panel-structure.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="elements-tests.js"></script>
<script>
diff --git a/LayoutTests/inspector/evaluate-in-frontend.html b/LayoutTests/inspector/evaluate-in-frontend.html
index 36a757d..891afae 100755
--- a/LayoutTests/inspector/evaluate-in-frontend.html
+++ b/LayoutTests/inspector/evaluate-in-frontend.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script>
function doit()
diff --git a/LayoutTests/inspector/inspected-objects-not-overriden.html b/LayoutTests/inspector/inspected-objects-not-overriden.html
index d5d1294..747ea9e 100644
--- a/LayoutTests/inspector/inspected-objects-not-overriden.html
+++ b/LayoutTests/inspector/inspected-objects-not-overriden.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script>
function myImpl() {
diff --git a/LayoutTests/inspector/styles-iframe.html b/LayoutTests/inspector/styles-iframe.html
index ddc51f5..83cef91 100755
--- a/LayoutTests/inspector/styles-iframe.html
+++ b/LayoutTests/inspector/styles-iframe.html
@@ -5,7 +5,7 @@
body { background:blue; }
</style>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="elements-tests.js"></script>
<script>
diff --git a/LayoutTests/inspector/syntax-highlight-css.html b/LayoutTests/inspector/syntax-highlight-css.html
index 96740ea..d89c081 100644
--- a/LayoutTests/inspector/syntax-highlight-css.html
+++ b/LayoutTests/inspector/syntax-highlight-css.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="syntax-highlight.js"></script>
<script>
diff --git a/LayoutTests/inspector/syntax-highlight-javascript.html b/LayoutTests/inspector/syntax-highlight-javascript.html
index 720a1c5..833c2a1 100644
--- a/LayoutTests/inspector/syntax-highlight-javascript.html
+++ b/LayoutTests/inspector/syntax-highlight-javascript.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="syntax-highlight.js"></script>
<script>
diff --git a/LayoutTests/inspector/timeline-enum-stability.html b/LayoutTests/inspector/timeline-enum-stability.html
index 5553b16..d582008 100644
--- a/LayoutTests/inspector/timeline-enum-stability.html
+++ b/LayoutTests/inspector/timeline-enum-stability.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script>
function dumpTimelineAgentRecordType(types) {
diff --git a/LayoutTests/inspector/timeline-event-dispatch.html b/LayoutTests/inspector/timeline-event-dispatch.html
index ee32a54..203d2b0 100644
--- a/LayoutTests/inspector/timeline-event-dispatch.html
+++ b/LayoutTests/inspector/timeline-event-dispatch.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="timeline-test.js"></script>
<script>
diff --git a/LayoutTests/inspector/timeline-layout.html b/LayoutTests/inspector/timeline-layout.html
index 822f2d8..2446e71 100644
--- a/LayoutTests/inspector/timeline-layout.html
+++ b/LayoutTests/inspector/timeline-layout.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="timeline-test.js"></script>
<script>
diff --git a/LayoutTests/inspector/timeline-mark-timeline.html b/LayoutTests/inspector/timeline-mark-timeline.html
index da8c410..24e7a7a 100644
--- a/LayoutTests/inspector/timeline-mark-timeline.html
+++ b/LayoutTests/inspector/timeline-mark-timeline.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="timeline-test.js"></script>
<script>
diff --git a/LayoutTests/inspector/timeline-network-resource.html b/LayoutTests/inspector/timeline-network-resource.html
index ae46d2e..fe28ed3 100644
--- a/LayoutTests/inspector/timeline-network-resource.html
+++ b/LayoutTests/inspector/timeline-network-resource.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="timeline-test.js"></script>
<script>
diff --git a/LayoutTests/inspector/timeline-paint.html b/LayoutTests/inspector/timeline-paint.html
index 21d892f..de8a913 100644
--- a/LayoutTests/inspector/timeline-paint.html
+++ b/LayoutTests/inspector/timeline-paint.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="timeline-test.js"></script>
<script>
diff --git a/LayoutTests/inspector/timeline-parse-html.html b/LayoutTests/inspector/timeline-parse-html.html
index 11d8f5a..176451f 100644
--- a/LayoutTests/inspector/timeline-parse-html.html
+++ b/LayoutTests/inspector/timeline-parse-html.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="timeline-test.js"></script>
<script>
diff --git a/LayoutTests/inspector/timeline-recalculate-styles.html b/LayoutTests/inspector/timeline-recalculate-styles.html
index c4e4d34..10213b9 100644
--- a/LayoutTests/inspector/timeline-recalculate-styles.html
+++ b/LayoutTests/inspector/timeline-recalculate-styles.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="timeline-test.js"></script>
<style>
diff --git a/LayoutTests/inspector/timeline-script-tag-1.html b/LayoutTests/inspector/timeline-script-tag-1.html
index 8ea1a36..131d34e 100644
--- a/LayoutTests/inspector/timeline-script-tag-1.html
+++ b/LayoutTests/inspector/timeline-script-tag-1.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="timeline-test.js"></script>
<script>
diff --git a/LayoutTests/inspector/timeline-script-tag-2.html b/LayoutTests/inspector/timeline-script-tag-2.html
index 03c1bfd..53e3d48 100644
--- a/LayoutTests/inspector/timeline-script-tag-2.html
+++ b/LayoutTests/inspector/timeline-script-tag-2.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script src="timeline-test.js"></script>
<script>
diff --git a/LayoutTests/inspector/timeline-trivial.html b/LayoutTests/inspector/timeline-trivial.html
index c3ca5f8..6feed9b 100644
--- a/LayoutTests/inspector/timeline-trivial.html
+++ b/LayoutTests/inspector/timeline-trivial.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="inspector-test.js"></script>
+<script src="../http/tests/inspector/inspector-test.js"></script>
<script>
function doit()
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 0f7f02e..decb673 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -214,6 +214,7 @@ http/tests/cache/subresource-failover-to-network.html
# Missing layoutTestController.evaluateInWebInspector()
# https://bugs.webkit.org/show_bug.cgi?id=33096
+http/tests/inspector/inspect-iframe-from-different-domain.html
inspector/cookie-resource-match.html
inspector/elements-img-tooltip.html
inspector/elements-panel-selection-on-refresh.html
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list