Diff
Modified: trunk/LayoutTests/ChangeLog (88242 => 88243)
--- trunk/LayoutTests/ChangeLog 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/ChangeLog 2011-06-07 16:33:06 UTC (rev 88243)
@@ -1,3 +1,28 @@
+2011-06-07 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r88238.
+ http://trac.webkit.org/changeset/88238
+ https://bugs.webkit.org/show_bug.cgi?id=62216
+
+ Broke a couple of inspector tests (Requested by apavlov on
+ #webkit).
+
+ * http/tests/inspector/inspect-iframe-from-different-domain.html:
+ * inspector/elements/elements-delete-inline-style.html:
+ * inspector/elements/elements-panel-styles.html:
+ * inspector/styles/styles-add-invalid-property.html:
+ * inspector/styles/styles-cancel-editing.html:
+ * inspector/styles/styles-commit-editing.html:
+ * inspector/styles/styles-computed-trace.html:
+ * inspector/styles/styles-disable-inherited.html:
+ * inspector/styles/styles-disable-then-change.html:
+ * inspector/styles/styles-disable-then-delete.html:
+ * inspector/styles/styles-disable-then-enable.html:
+ * inspector/styles/styles-iframe.html:
+ * inspector/styles/styles-update-from-js-expected.txt:
+ * inspector/styles/styles-update-from-js.html:
+ * inspector/styles/styles-url-linkify.html:
+
2011-06-07 Alexander Pavlov <[email protected]>
Reviewed by Yury Semikhatsky.
Modified: trunk/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain.html (88242 => 88243)
--- trunk/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -16,8 +16,7 @@
function test()
{
- InspectorTest.selectNodeWithId("iframe-body");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
+ InspectorTest.selectNodeWithId("iframe-body", step1);
function step1()
{
Modified: trunk/LayoutTests/inspector/elements/elements-delete-inline-style.html (88242 => 88243)
--- trunk/LayoutTests/inspector/elements/elements-delete-inline-style.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/elements/elements-delete-inline-style.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -7,15 +7,14 @@
function test()
{
WebInspector.showPanel("elements");
- InspectorTest.selectNodeWithId("inspected");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
+ InspectorTest.selectNodeWithId("inspected", step1);
function step1(node)
{
InspectorTest.addResult("Before style property removal:");
InspectorTest.dumpSelectedElementStyles(true);
node.removeAttribute("style");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step2);
+ InspectorTest.runAfterPendingDispatches(step2);
}
function step2()
Modified: trunk/LayoutTests/inspector/elements/elements-panel-styles.html (88242 => 88243)
--- trunk/LayoutTests/inspector/elements/elements-panel-styles.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/elements/elements-panel-styles.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -8,8 +8,7 @@
function test()
{
- InspectorTest.selectNodeWithId("foo");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
+ InspectorTest.selectNodeWithId("foo", step1);
function step1()
{
Modified: trunk/LayoutTests/inspector/styles/styles-add-invalid-property.html (88242 => 88243)
--- trunk/LayoutTests/inspector/styles/styles-add-invalid-property.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/styles/styles-add-invalid-property.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -7,8 +7,7 @@
function test()
{
WebInspector.showPanel("elements");
- InspectorTest.selectNodeWithId("inspected");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step0);
+ InspectorTest.selectNodeWithId("inspected", step0);
var treeElement;
var section;
@@ -46,14 +45,12 @@
function step3()
{
- InspectorTest.selectNodeWithId("other");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step4);
+ InspectorTest.selectNodeWithId("other", step4);
}
function step4()
{
- InspectorTest.selectNodeWithId("inspected");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step5);
+ InspectorTest.selectNodeWithId("inspected", step5);
}
function step5()
Modified: trunk/LayoutTests/inspector/styles/styles-cancel-editing.html (88242 => 88243)
--- trunk/LayoutTests/inspector/styles/styles-cancel-editing.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/styles/styles-cancel-editing.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -7,8 +7,7 @@
function test()
{
WebInspector.showPanel("elements");
- InspectorTest.selectNodeWithId("inspected");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
+ InspectorTest.selectNodeWithId("inspected", step1);
var treeElement;
var section;
@@ -34,14 +33,12 @@
function step2()
{
- InspectorTest.selectNodeWithId("other");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step3);
+ InspectorTest.selectNodeWithId("other", step3);
}
function step3()
{
- InspectorTest.selectNodeWithId("inspected");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step4);
+ InspectorTest.selectNodeWithId("inspected", step4);
}
function step4()
Modified: trunk/LayoutTests/inspector/styles/styles-commit-editing.html (88242 => 88243)
--- trunk/LayoutTests/inspector/styles/styles-commit-editing.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/styles/styles-commit-editing.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -7,8 +7,7 @@
function test()
{
WebInspector.showPanel("elements");
- InspectorTest.selectNodeWithId("inspected");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
+ InspectorTest.selectNodeWithId("inspected", step1);
var treeElement;
var section;
@@ -35,14 +34,12 @@
function step2()
{
- InspectorTest.selectNodeWithId("other");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step3);
+ InspectorTest.selectNodeWithId("other", step3);
}
function step3()
{
- InspectorTest.selectNodeWithId("inspected");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step4);
+ InspectorTest.selectNodeWithId("inspected", step4);
}
function step4()
Modified: trunk/LayoutTests/inspector/styles/styles-computed-trace.html (88242 => 88243)
--- trunk/LayoutTests/inspector/styles/styles-computed-trace.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/styles/styles-computed-trace.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -37,16 +37,14 @@
function test()
{
- InspectorTest.selectNodeWithId("id1");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
+ InspectorTest.selectNodeWithId("id1", step1);
function step1()
{
InspectorTest.addResult("==== Computed style for ID1 ====");
InspectorTest.dumpSelectedElementStyles(false, true);
- InspectorTest.selectNodeWithId("id2");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step2);
+ InspectorTest.selectNodeWithId("id2", step2);
}
function step2()
Modified: trunk/LayoutTests/inspector/styles/styles-disable-inherited.html (88242 => 88243)
--- trunk/LayoutTests/inspector/styles/styles-disable-inherited.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/styles/styles-disable-inherited.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -7,8 +7,7 @@
function test()
{
- InspectorTest.selectNodeWithId("nested");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
+ InspectorTest.selectNodeWithId("nested", step1);
function step1()
{
@@ -16,16 +15,14 @@
InspectorTest.addResult("Before disable");
InspectorTest.dumpSelectedElementStyles(true);
- InspectorTest.selectNodeWithId("container");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step2);
+ InspectorTest.selectNodeWithId("container", step2);
}
function step2()
{
var treeItem = InspectorTest.getElementStylePropertyTreeItem("font-weight");
treeItem.toggleEnabled({ target: { checked: false } });
- InspectorTest.selectNodeWithId("nested");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step3);
+ InspectorTest.selectNodeWithId("nested", step3);
}
function step3()
Modified: trunk/LayoutTests/inspector/styles/styles-disable-then-change.html (88242 => 88243)
--- trunk/LayoutTests/inspector/styles/styles-disable-then-change.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/styles/styles-disable-then-change.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -6,8 +6,7 @@
function test()
{
- InspectorTest.selectNodeWithId("container");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
+ InspectorTest.selectNodeWithId("container", step1);
function step1()
{
Modified: trunk/LayoutTests/inspector/styles/styles-disable-then-delete.html (88242 => 88243)
--- trunk/LayoutTests/inspector/styles/styles-disable-then-delete.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/styles/styles-disable-then-delete.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -6,8 +6,7 @@
function test()
{
- InspectorTest.selectNodeWithId("container");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
+ InspectorTest.selectNodeWithId("container", step1);
function step1()
{
@@ -35,17 +34,15 @@
function step3()
{
- InspectorTest.selectNodeWithId("other");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step4);
+ InspectorTest.selectNodeWithId("other", step4);
}
function step4()
{
- InspectorTest.selectNodeWithId("container");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step5);
+ InspectorTest.selectNodeWithId("container", step5);
}
- function step5()
+ function step5(node)
{
InspectorTest.addResult("After delete");
InspectorTest.dumpSelectedElementStyles(true, true);
Modified: trunk/LayoutTests/inspector/styles/styles-disable-then-enable.html (88242 => 88243)
--- trunk/LayoutTests/inspector/styles/styles-disable-then-enable.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/styles/styles-disable-then-enable.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -6,8 +6,7 @@
function test()
{
- InspectorTest.selectNodeWithId("container");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
+ InspectorTest.selectNodeWithId("container", step1);
function step1()
{
Modified: trunk/LayoutTests/inspector/styles/styles-iframe.html (88242 => 88243)
--- trunk/LayoutTests/inspector/styles/styles-iframe.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/styles/styles-iframe.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -30,8 +30,7 @@
{
InspectorTest.addResult("Main frame style:");
InspectorTest.dumpSelectedElementStyles(true, false, true);
- InspectorTest.selectNodeWithId("iframeBody");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step2);
+ InspectorTest.selectNodeWithId("iframeBody", step2);
}
function step2()
Modified: trunk/LayoutTests/inspector/styles/styles-update-from-js-expected.txt (88242 => 88243)
--- trunk/LayoutTests/inspector/styles/styles-update-from-js-expected.txt 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/styles/styles-update-from-js-expected.txt 2011-06-07 16:33:06 UTC (rev 88243)
@@ -1,6 +1,9 @@
Tests that changes to an inline style from _javascript_ are reflected in the Styles pane and Elements tree.
-Modified "style" attribute
+
+Running: testInit
+
+Running: testSetStyleAttribute
<div id="container" style="color: #daC0DE; border: 1px solid black;"></div>
[expanded] element.style { ()
color: #DAC0DE;
@@ -19,13 +22,15 @@
border-left-color: black;
-Modified cssText
+
+Running: testSetStyleCSSText
<div id="container" style="color: rgb(192, 255, 238); "></div>
[expanded] element.style { ()
color: #C0FFEE;
-Modified parsed attributes
+
+Running: testSetViaParsedAttributes
<div id="container" style="color: rgb(192, 255, 238); border-top-style: dashed; border-right-style: dashed; border-bottom-style: dashed; border-left-style: dashed; border-top-color: green; border-right-color: green; border-bottom-color: green; border-left-color: green; border-top-width: 3px; border-right-width: 3px; border-bottom-width: 3px; border-left-width: 3px; "></div>
[expanded] element.style { ()
color: #C0FFEE;
Modified: trunk/LayoutTests/inspector/styles/styles-update-from-js.html (88242 => 88243)
--- trunk/LayoutTests/inspector/styles/styles-update-from-js.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/styles/styles-update-from-js.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -22,37 +22,54 @@
function test()
{
- var sniffCount = 0;
+ InspectorTest.runTestSuite([
- InspectorTest.selectNodeWithId("container");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", selectCallback);
+ function testInit(next)
+ {
+ InspectorTest.selectNodeWithId("container", next);
+ },
- function selectCallback()
- {
- InspectorTest.evaluateInPage("modifyStyleAttribute()");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", snifferCallback, true);
- }
+ function testSetStyleAttribute(next)
+ {
+ var updateCount = 0;
+ function callback()
+ {
+ // Expect two updates while setting attribute.
+ if (++updateCount === 2) {
+ dumpAttributeAndStyles();
+ next();
+ }
+ }
+ InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", callback, true);
+ InspectorTest.evaluateInPage("modifyStyleAttribute()");
+ },
- function snifferCallback()
- {
- switch (++sniffCount) {
- case 1:
- InspectorTest.addResult("Modified \"style\" attribute");
+ function testSetStyleCSSText(next)
+ {
+ var updateCount = 0;
+ function callback()
+ {
+ // Expect two updates while setting css text.
+ if (++updateCount === 2) {
+ dumpAttributeAndStyles();
+ next();
+ }
+ }
+ InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", callback, true);
+ InspectorTest.evaluateInPage("modifyCSSText()", callback);
+ },
+
+ function testSetViaParsedAttributes(next)
+ {
+ function callback()
+ {
dumpAttributeAndStyles();
- InspectorTest.evaluateInPage("modifyCSSText()");
- break;
- case 2:
- InspectorTest.addResult("Modified cssText");
- dumpAttributeAndStyles();
- InspectorTest.evaluateInPage("modifyParsedAttributes()");
- break;
- case 3:
- InspectorTest.addResult("Modified parsed attributes");
- dumpAttributeAndStyles();
- InspectorTest.completeTest();
- break;
+ next();
+ }
+ InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", callback);
+ InspectorTest.evaluateInPage("modifyParsedAttributes()");
}
- }
+ ]);
function dumpAttributeAndStyles()
{
Modified: trunk/LayoutTests/inspector/styles/styles-url-linkify.html (88242 => 88243)
--- trunk/LayoutTests/inspector/styles/styles-url-linkify.html 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/LayoutTests/inspector/styles/styles-url-linkify.html 2011-06-07 16:33:06 UTC (rev 88243)
@@ -46,16 +46,13 @@
InspectorTest.addResult(output.join("/"));
}
- InspectorTest.selectNodeWithId("local");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step1);
+ InspectorTest.selectNodeWithId("local", step1);
function step1()
{
InspectorTest.addResult("Link for a URI from CSS document:");
dumpHref();
- InspectorTest.selectNodeWithId("iframed");
- InspectorTest.addSniffer(WebInspector.StylesSidebarPane.prototype, "_rebuildUpdate", step2);
-
+ InspectorTest.selectNodeWithId("iframed", step2);
}
function step2()
Modified: trunk/Source/WebCore/ChangeLog (88242 => 88243)
--- trunk/Source/WebCore/ChangeLog 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/Source/WebCore/ChangeLog 2011-06-07 16:33:06 UTC (rev 88243)
@@ -1,3 +1,15 @@
+2011-06-07 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r88238.
+ http://trac.webkit.org/changeset/88238
+ https://bugs.webkit.org/show_bug.cgi?id=62216
+
+ Broke a couple of inspector tests (Requested by apavlov on
+ #webkit).
+
+ * inspector/front-end/StylesSidebarPane.js:
+ (WebInspector.StylesSidebarPane.prototype.update):
+
2011-06-07 Dinu Jacob <[email protected]>
Reviewed by Dimitri Glazkov.
Modified: trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js (88242 => 88243)
--- trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2011-06-07 16:20:07 UTC (rev 88242)
+++ trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2011-06-07 16:33:06 UTC (rev 88243)
@@ -235,21 +235,10 @@
this._refreshUpdate(node, computedStyle, editedSection);
}
- function reloadAllStyles()
- {
- delete this._reloadAllStylesTimer;
- WebInspector.cssModel.getStylesAsync(this._allStylesNodeId, stylesCallback.bind(this))
- }
-
if (refresh)
WebInspector.cssModel.getComputedStyleAsync(node.id, computedStyleCallback.bind(this));
- else {
- // Always refresh the node to request styles for.
- this._allStylesNodeId = node.id;
- if ("_reloadAllStylesTimer" in this)
- return;
- this._reloadAllStylesTimer = setTimeout(reloadAllStyles.bind(this), 0);
- }
+ else
+ WebInspector.cssModel.getStylesAsync(node.id, stylesCallback.bind(this));
},
_refreshUpdate: function(node, computedStyle, editedSection)
