Title: [97606] trunk
Revision
97606
Author
apav...@chromium.org
Date
2011-10-17 04:46:06 -0700 (Mon, 17 Oct 2011)

Log Message

Web Inspector: Editing CSS selector doesn't fire onResourceContentCommitted
https://bugs.webkit.org/show_bug.cgi?id=70018

Reviewed by Yury Semikhatsky.

Source/WebCore:

Test: inspector/styles/commit-selector.html

* inspector/front-end/CSSStyleModel.js:
(WebInspector.CSSStyleModel.prototype.setRuleSelector.callback):
(WebInspector.CSSStyleModel.prototype.setRuleSelector):

LayoutTests:

* inspector/styles/commit-selector-expected.txt: Added.
* inspector/styles/commit-selector.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (97605 => 97606)


--- trunk/LayoutTests/ChangeLog	2011-10-17 11:38:55 UTC (rev 97605)
+++ trunk/LayoutTests/ChangeLog	2011-10-17 11:46:06 UTC (rev 97606)
@@ -1,3 +1,13 @@
+2011-10-17  Alexander Pavlov  <apav...@chromium.org>
+
+        Web Inspector: Editing CSS selector doesn't fire onResourceContentCommitted
+        https://bugs.webkit.org/show_bug.cgi?id=70018
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/styles/commit-selector-expected.txt: Added.
+        * inspector/styles/commit-selector.html: Added.
+
 2011-10-17  Kent Tamura  <tk...@chromium.org>
 
         [Chromium] Test expectation update

Added: trunk/LayoutTests/inspector/styles/commit-selector-expected.txt (0 => 97606)


--- trunk/LayoutTests/inspector/styles/commit-selector-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/inspector/styles/commit-selector-expected.txt	2011-10-17 11:46:06 UTC (rev 97606)
@@ -0,0 +1,25 @@
+Tests that renaming a selector updates element styles. Bug 70018.
+
+Text
+=== Before selector modification ===
+[expanded] element.style { ()
+color: red;
+
+======== Matched CSS Rules ========
+[expanded] #inspected { (commit-selector.html:4)
+/-- overloaded --/ color: green;
+
+[expanded] div { (user agent stylesheet)
+display: block;
+
+
+=== After selector modification ===
+[expanded] element.style { ()
+color: red;
+
+======== Matched CSS Rules ========
+[expanded] div { (user agent stylesheet)
+display: block;
+
+
+
Property changes on: trunk/LayoutTests/inspector/styles/commit-selector-expected.txt
___________________________________________________________________

Added: svn:eol-style

Added: trunk/LayoutTests/inspector/styles/commit-selector.html (0 => 97606)


--- trunk/LayoutTests/inspector/styles/commit-selector.html	                        (rev 0)
+++ trunk/LayoutTests/inspector/styles/commit-selector.html	2011-10-17 11:46:06 UTC (rev 97606)
@@ -0,0 +1,48 @@
+<html>
+<head>
+<style>
+#inspected {
+  color: green;
+}
+</style>
+<script src=""
+<script src=""
+<script>
+
+function test()
+{
+    WebInspector.showPanel("elements");
+    InspectorTest.selectNodeAndWaitForStyles("inspected", step1);
+
+    function step1()
+    {
+        InspectorTest.addResult("=== Before selector modification ===");
+        InspectorTest.dumpSelectedElementStyles(true);
+        var section = WebInspector.panels.elements.sidebarPanes.styles.sections[0][2];
+        section.startEditingSelector();
+        section._selectorElement.textContent = "#inspectedChanged";
+        section._selectorElement.dispatchEvent(InspectorTest.createKeyEvent("Enter"));
+        InspectorTest.runAfterPendingDispatches(step2);
+    }
+
+    function step2()
+    {
+        InspectorTest.addResult("=== After selector modification ===");
+        InspectorTest.dumpSelectedElementStyles(true);
+        InspectorTest.completeTest();
+    }
+}
+
+</script>
+</head>
+
+<body _onload_="runTest()">
+<p>
+Tests that renaming a selector updates element styles. <a href="" 70018</a>.
+</p>
+
+<div id="inspected" style="color: red">Text</div>
+<div id="other"></div>
+
+</body>
+</html>
Property changes on: trunk/LayoutTests/inspector/styles/commit-selector.html
___________________________________________________________________

Added: svn:eol-style

Modified: trunk/Source/WebCore/ChangeLog (97605 => 97606)


--- trunk/Source/WebCore/ChangeLog	2011-10-17 11:38:55 UTC (rev 97605)
+++ trunk/Source/WebCore/ChangeLog	2011-10-17 11:46:06 UTC (rev 97606)
@@ -1,3 +1,16 @@
+2011-10-17  Alexander Pavlov  <apav...@chromium.org>
+
+        Web Inspector: Editing CSS selector doesn't fire onResourceContentCommitted
+        https://bugs.webkit.org/show_bug.cgi?id=70018
+
+        Reviewed by Yury Semikhatsky.
+
+        Test: inspector/styles/commit-selector.html
+
+        * inspector/front-end/CSSStyleModel.js:
+        (WebInspector.CSSStyleModel.prototype.setRuleSelector.callback):
+        (WebInspector.CSSStyleModel.prototype.setRuleSelector):
+
 2011-10-17  Andreas Kling  <kl...@webkit.org>
 
         CSS/XSLStyleSheet: Remove insert() and remove().

Modified: trunk/Source/WebCore/inspector/front-end/CSSStyleModel.js (97605 => 97606)


--- trunk/Source/WebCore/inspector/front-end/CSSStyleModel.js	2011-10-17 11:38:55 UTC (rev 97605)
+++ trunk/Source/WebCore/inspector/front-end/CSSStyleModel.js	2011-10-17 11:46:06 UTC (rev 97606)
@@ -50,8 +50,18 @@
 }
 
 WebInspector.CSSStyleModel.prototype = {
+    /**
+     * @param {DOMAgent.NodeId} nodeId
+     * @param {?Array.<string>|undefined} forcedPseudoClasses
+     * @param {function(?*)} userCallback
+     */
     getStylesAsync: function(nodeId, forcedPseudoClasses, userCallback)
     {
+        /**
+         * @param {function(?*)} userCallback
+         * @param {?Protocol.Error} error
+         * @param {?CSSAgent.CSSNodeStyles} payload
+         */
         function callback(userCallback, error, payload)
         {
             if (error) {
@@ -98,8 +108,17 @@
         CSSAgent.getStylesForNode(nodeId, forcedPseudoClasses || [], callback.bind(null, userCallback));
     },
 
+    /**
+     * @param {DOMAgent.NodeId} nodeId
+     * @param {function(?WebInspector.CSSStyleDeclaration)} userCallback
+     */
     getComputedStyleAsync: function(nodeId, userCallback)
     {
+        /**
+         * @param {function(?WebInspector.CSSStyleDeclaration)} userCallback
+         * @param {?Protocol.Error} error
+         * @param {?CSSAgent.CSSStyle} stylePayload
+         */
         function callback(userCallback, error, stylePayload)
         {
             if (error)
@@ -111,8 +130,17 @@
         CSSAgent.getComputedStyleForNode(nodeId, callback.bind(null, userCallback));
     },
 
+    /**
+     * @param {DOMAgent.NodeId} nodeId
+     * @param {function(?WebInspector.CSSStyleDeclaration)} userCallback
+     */
     getInlineStyleAsync: function(nodeId, userCallback)
     {
+        /**
+         * @param {function(?WebInspector.CSSStyleDeclaration)} userCallback
+         * @param {?Protocol.Error} error
+         * @param {?CSSAgent.CSSStyle} stylePayload
+         */
         function callback(userCallback, error, stylePayload)
         {
             if (error)
@@ -124,8 +152,21 @@
         CSSAgent.getInlineStyleForNode(nodeId, callback.bind(null, userCallback));
     },
 
+    /**
+     * @param {CSSAgent.CSSRuleId} ruleId
+     * @param {DOMAgent.NodeId} nodeId
+     * @param {string} newSelector
+     * @param {function(WebInspector.CSSRule, boolean)} successCallback
+     * @param {function()} failureCallback
+     */
     setRuleSelector: function(ruleId, nodeId, newSelector, successCallback, failureCallback)
     {
+        /**
+         * @param {DOMAgent.NodeId} nodeId
+         * @param {function(WebInspector.CSSRule, boolean)} successCallback
+         * @param {*} rulePayload
+         * @param {?Array.<DOMAgent.NodeId>} selectedNodeIds
+         */
         function checkAffectsCallback(nodeId, successCallback, rulePayload, selectedNodeIds)
         {
             if (!selectedNodeIds)
@@ -136,9 +177,16 @@
             this._fireStyleSheetChanged(rule.id.styleSheetId, true);
         }
 
-        function callback(nodeId, successCallback, failureCallback, error, newSelector, rulePayload)
+        /**
+         * @param {DOMAgent.NodeId} nodeId
+         * @param {function(WebInspector.CSSRule, boolean)} successCallback
+         * @param {function()} failureCallback
+         * @param {?Protocol.Error} error
+         * @param {string} newSelector
+         * @param {*=} rulePayload
+         */
+        function callback(nodeId, successCallback, failureCallback, newSelector, error, rulePayload)
         {
-            // FIXME: looks like rulePayload is always null.
             if (error)
                 failureCallback();
             else {
@@ -153,6 +201,12 @@
         CSSAgent.setRuleSelector(ruleId, newSelector, callback.bind(this, nodeId, successCallback, failureCallback, newSelector));
     },
 
+    /**
+     * @param {DOMAgent.NodeId} nodeId
+     * @param {string} selector
+     * @param {function(WebInspector.CSSRule, boolean)} successCallback
+     * @param {function()} failureCallback
+     */
     addRule: function(nodeId, selector, successCallback, failureCallback)
     {
         function checkAffectsCallback(nodeId, successCallback, rulePayload, selectedNodeIds)
@@ -166,6 +220,13 @@
             this._fireStyleSheetChanged(rule.id.styleSheetId, true);
         }
 
+        /**
+         * @param {function(WebInspector.CSSRule, boolean)} successCallback
+         * @param {function()} failureCallback
+         * @param {string} selector
+         * @param {?Protocol.Error} error
+         * @param {?CSSAgent.CSSRule} rulePayload
+         */
         function callback(successCallback, failureCallback, selector, error, rulePayload)
         {
             if (error) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to