Changeset 102581 in webkit

Timestamp:

Dec 12, 2011 7:24:36 AM (12 years ago)

Author:

apavlov@chromium.org

Message:

Web Inspector: [Styles] Modified selector text needs sanitization
​https://bugs.webkit.org/show_bug.cgi?id=74291

Reviewed by Yury Semikhatsky.

Source/WebCore:

• inspector/front-end/StylesSidebarPane.js:

LayoutTests:

• inspector/styles/commit-selector-expected.txt:
• inspector/styles/commit-selector.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/styles/commit-selector-expected.txt (modified) (1 diff)
• LayoutTests/inspector/styles/commit-selector.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/StylesSidebarPane.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-12  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: [Styles] Modified selector text needs sanitization
+        https://bugs.webkit.org/show_bug.cgi?id=74291
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/styles/commit-selector-expected.txt:
+        * inspector/styles/commit-selector.html:
+
 2011-11-30  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/LayoutTests/inspector/styles/commit-selector-expected.txt

@@ -17 +17 @@
 
 
-=== After selector modification ===
+=== After non-affecting selector modification ===
+[expanded] 
+element.style  { ()
+color: red;
+
+======== Matched CSS Rules ========
+[expanded] 
+hr, #inspected  { (commit-selector.html:4)
+/-- overloaded --/ color: green;
+
+[expanded] 
+div  { (user agent stylesheet)
+display: block;
+
+
+=== After affecting selector modification ===
 [expanded] 
 element.style  { ()

trunk/LayoutTests/inspector/styles/commit-selector.html

@@ -21 +21 @@
         var section = WebInspector.panels.elements.sidebarPanes.styles.sections[0][2];
         section.startEditingSelector();
-        section._selectorElement.textContent = "#inspectedChanged";
+        section._selectorElement.textContent = "hr, #inspected ";
         section._selectorElement.dispatchEvent(InspectorTest.createKeyEvent("Enter"));
         InspectorTest.runAfterPendingDispatches(step2);
@@ -28 +28 @@
     function step2()
     {
-        InspectorTest.addResult("=== After selector modification ===");
+        InspectorTest.addResult("=== After non-affecting 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(step3);
+    }
+
+    function step3()
+    {
+        InspectorTest.addResult("=== After affecting selector modification ===");
         InspectorTest.dumpSelectedElementStyles(true);
         InspectorTest.completeTest();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-12  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: [Styles] Modified selector text needs sanitization
+        https://bugs.webkit.org/show_bug.cgi?id=74291
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/StylesSidebarPane.js:
+
 2011-12-12  Renata Hodovan  <reni@webkit.org>
 

trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js

@@ -1208 +1208 @@
     editingSelectorCommitted: function(element, newContent, oldContent, context, moveDirection)
     {
-        if (newContent === oldContent)
+        if (newContent)
+            newContent = newContent.trim();
+        if (newContent === oldContent) {
+            // Revert to a trimmed version of the selector if need be.
+            this._selectorElement.textContent = newContent;
             return this._moveEditorFromSelector(moveDirection);
+        }
 
         function successCallback(newRule, doesAffectSelectedNode)