Title: [120708] trunk/LayoutTests
- Revision
- 120708
- Author
- [email protected]
- Date
- 2012-06-19 07:03:15 -0700 (Tue, 19 Jun 2012)
Log Message
New inspector/styles/inject-stylesheet.html fails
https://bugs.webkit.org/show_bug.cgi?id=89364
Reviewed by Zoltan Herczeg.
LayoutTestController in Chromium injects testRunner into the Inspector window, while its other implementations don't.
Additionally, testRunner.addUserStyleSheet() behavior differs across platforms: Chromium injects stylesheets
with the "Author" level, while the others do with the "User" level, so the Chromium expectation stands apart.
* inspector/styles/inject-stylesheet-expected.txt:
* inspector/styles/inject-stylesheet.html:
* platform/chromium/inspector/styles/inject-stylesheet-expected.txt: Copied from LayoutTests/inspector/styles/inject-stylesheet-expected.txt.
* platform/qt/Skipped:
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (120707 => 120708)
--- trunk/LayoutTests/ChangeLog 2012-06-19 13:59:20 UTC (rev 120707)
+++ trunk/LayoutTests/ChangeLog 2012-06-19 14:03:15 UTC (rev 120708)
@@ -1,3 +1,19 @@
+2012-06-19 Alexander Pavlov <[email protected]>
+
+ New inspector/styles/inject-stylesheet.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=89364
+
+ Reviewed by Zoltan Herczeg.
+
+ LayoutTestController in Chromium injects testRunner into the Inspector window, while its other implementations don't.
+ Additionally, testRunner.addUserStyleSheet() behavior differs across platforms: Chromium injects stylesheets
+ with the "Author" level, while the others do with the "User" level, so the Chromium expectation stands apart.
+
+ * inspector/styles/inject-stylesheet-expected.txt:
+ * inspector/styles/inject-stylesheet.html:
+ * platform/chromium/inspector/styles/inject-stylesheet-expected.txt: Copied from LayoutTests/inspector/styles/inject-stylesheet-expected.txt.
+ * platform/qt/Skipped:
+
2012-06-19 Dominik Röttsches <[email protected]>
[GTK] Assert failure in svg/batik/text/textDecoration.svg,textEffect3.svg for 64bit Debug bot
Modified: trunk/LayoutTests/inspector/styles/inject-stylesheet-expected.txt (120707 => 120708)
--- trunk/LayoutTests/inspector/styles/inject-stylesheet-expected.txt 2012-06-19 13:59:20 UTC (rev 120707)
+++ trunk/LayoutTests/inspector/styles/inject-stylesheet-expected.txt 2012-06-19 14:03:15 UTC (rev 120708)
@@ -41,8 +41,9 @@
======== Matched CSS Rules ========
[expanded]
-#iframebody { (user stylesheet)
-background: red;
+media="screen" (inject-stylesheet-iframe-data.html)
+body { (inject-stylesheet-iframe-data.html:4)
+background: green;
background-image: initial;
background-repeat-x: initial;
background-repeat-y: initial;
@@ -51,13 +52,12 @@
background-position-y: initial;
background-origin: initial;
background-clip: initial;
- background-color: red;
+ background-color: green;
background-size: initial;
[expanded]
-media="screen" (inject-stylesheet-iframe-data.html)
-body { (inject-stylesheet-iframe-data.html:4)
-background: green;
+#iframebody { (user stylesheet)
+/-- overloaded --/ background: red;
/-- overloaded --/ background-image: initial;
/-- overloaded --/ background-repeat-x: initial;
/-- overloaded --/ background-repeat-y: initial;
@@ -66,7 +66,7 @@
/-- overloaded --/ background-position-y: initial;
/-- overloaded --/ background-origin: initial;
/-- overloaded --/ background-clip: initial;
- /-- overloaded --/ background-color: green;
+ /-- overloaded --/ background-color: red;
/-- overloaded --/ background-size: initial;
[expanded]
Modified: trunk/LayoutTests/inspector/styles/inject-stylesheet.html (120707 => 120708)
--- trunk/LayoutTests/inspector/styles/inject-stylesheet.html 2012-06-19 13:59:20 UTC (rev 120707)
+++ trunk/LayoutTests/inspector/styles/inject-stylesheet.html 2012-06-19 14:03:15 UTC (rev 120708)
@@ -9,6 +9,13 @@
<script src=""
<script>
+function injectStyleSheet()
+{
+ var styleSheet = "#main { color: red } #iframeBody { background: red }";
+ if (window.testRunner)
+ window.testRunner.addUserStyleSheet(styleSheet, true);
+}
+
function loadIframe()
{
var iframe = document.createElement("iframe");
@@ -18,16 +25,13 @@
function test()
{
- if (!window.testRunner) {
- InspectorTest.addResult("This test requires window.testRunner, exiting.");
- InspectorTest.completeTest();
- return;
- }
- var styleSheet = "#main { color: red } #iframeBody { background: red }";
+ InspectorTest.evaluateInPage("injectStyleSheet()", init);
- window.testRunner.addUserStyleSheet(styleSheet, true);
- InspectorTest.selectNodeAndWaitForStyles("main", step0);
+ function init()
+ {
+ InspectorTest.selectNodeAndWaitForStyles("main", step0);
+ }
function step0()
{
Copied: trunk/LayoutTests/platform/chromium/inspector/styles/inject-stylesheet-expected.txt (from rev 120707, trunk/LayoutTests/inspector/styles/inject-stylesheet-expected.txt) (0 => 120708)
--- trunk/LayoutTests/platform/chromium/inspector/styles/inject-stylesheet-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/inspector/styles/inject-stylesheet-expected.txt 2012-06-19 14:03:15 UTC (rev 120708)
@@ -0,0 +1,82 @@
+CONSOLE MESSAGE: line 9: iframe loaded
+Tests that injected user stylesheets are reflected in the Styles pane.
+
+
+Main frame style:
+[expanded]
+
+[expanded]
+element.style { ()
+
+======== Matched CSS Rules ========
+[expanded]
+media="screen" (inject-stylesheet.html)
+#main { (inject-stylesheet.html:5)
+background: blue;
+ background-image: initial;
+ background-repeat-x: initial;
+ background-repeat-y: initial;
+ background-attachment: initial;
+ background-position-x: initial;
+ background-position-y: initial;
+ background-origin: initial;
+ background-clip: initial;
+ background-color: blue;
+ background-size: initial;
+
+[expanded]
+#main { (user stylesheet)
+color: red;
+
+[expanded]
+div { (user agent stylesheet)
+display: block;
+
+
+iframe style:
+[expanded]
+
+[expanded]
+element.style { ()
+
+======== Matched CSS Rules ========
+[expanded]
+#iframebody { (user stylesheet)
+background: red;
+ background-image: initial;
+ background-repeat-x: initial;
+ background-repeat-y: initial;
+ background-attachment: initial;
+ background-position-x: initial;
+ background-position-y: initial;
+ background-origin: initial;
+ background-clip: initial;
+ background-color: red;
+ background-size: initial;
+
+[expanded]
+media="screen" (inject-stylesheet-iframe-data.html)
+body { (inject-stylesheet-iframe-data.html:4)
+background: green;
+ /-- overloaded --/ background-image: initial;
+ /-- overloaded --/ background-repeat-x: initial;
+ /-- overloaded --/ background-repeat-y: initial;
+ /-- overloaded --/ background-attachment: initial;
+ /-- overloaded --/ background-position-x: initial;
+ /-- overloaded --/ background-position-y: initial;
+ /-- overloaded --/ background-origin: initial;
+ /-- overloaded --/ background-clip: initial;
+ /-- overloaded --/ background-color: green;
+ /-- overloaded --/ background-size: initial;
+
+[expanded]
+body { (user agent stylesheet)
+display: block;
+margin: 8px;
+ margin-top: 8px;
+ margin-right: 8px;
+ margin-bottom: 8px;
+ margin-left: 8px;
+
+
+
Modified: trunk/LayoutTests/platform/qt/Skipped (120707 => 120708)
--- trunk/LayoutTests/platform/qt/Skipped 2012-06-19 13:59:20 UTC (rev 120707)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-06-19 14:03:15 UTC (rev 120708)
@@ -2526,7 +2526,3 @@
# [Qt]Web Inspector: inspector/extensions/extensions-network.html makes inspector/extensions/extensions-reload.html timeout
# https://bugs.webkit.org/show_bug.cgi?id=89349
inspector/extensions/extensions-reload.html
-
-# New inspector/styles/inject-stylesheet.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=89364
-inspector/styles/inject-stylesheet.html
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
