Changeset 86663 in webkit

Timestamp:

May 17, 2011 2:34:49 AM (13 years ago)

Author:

apavlov@chromium.org

Message:

2011-05-17 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: Increment/decrement of very big CSS numeric values results in invalid CSS
​https://bugs.webkit.org/show_bug.cgi?id=60890

• inspector/styles/up-down-numerics-and-colors-expected.txt:
• inspector/styles/up-down-numerics-and-colors.html:

2011-05-17 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: Increment/decrement of very big CSS numeric values results in invalid CSS
​https://bugs.webkit.org/show_bug.cgi?id=60890

• inspector/front-end/MetricsSidebarPane.js: (WebInspector.MetricsSidebarPane.prototype._handleKeyDown):
• inspector/front-end/StylesSidebarPane.js: (WebInspector.StylesSidebarPane.alteredFloatNumber): (WebInspector.StylePropertyTreeElement.prototype):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/styles/up-down-numerics-and-colors-expected.txt (modified) (1 diff)
• LayoutTests/inspector/styles/up-down-numerics-and-colors.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/MetricsSidebarPane.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/StylesSidebarPane.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-17  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Increment/decrement of very big CSS numeric values results in invalid CSS
+        https://bugs.webkit.org/show_bug.cgi?id=60890
+
+        * inspector/styles/up-down-numerics-and-colors-expected.txt:
+        * inspector/styles/up-down-numerics-and-colors.html:
+
 2011-05-17  Yuzo Fujishima  <yuzo@google.com>
 

trunk/LayoutTests/inspector/styles/up-down-numerics-and-colors-expected.txt

@@ -14 +14 @@
 opacity: 10.6;
 
+Running: testAlterBigNumber
+-webkit-transform: rotate(1000000000000000065537deg);
+

trunk/LayoutTests/inspector/styles/up-down-numerics-and-colors.html

@@ -6 +6 @@
     color: #FF2;
     opacity: .5;
+    -webkit-transform: rotate(1000000000000000065537deg);
 }
 </style>
@@ -44 +45 @@
         },
 
-        function testAlterNumber()
+        function testAlterNumber(next)
         {
             var opacityTreeElement = section.findTreeElementWithName("opacity");
@@ -51 +52 @@
             opacityTreeElement.valueElement.dispatchEvent(InspectorTest.createKeyEvent("PageUp"));
             InspectorTest.addResult(opacityTreeElement.listItemElement.textContent);
-            InspectorTest.completeTest();
+            next();
+        },
+
+        function testAlterBigNumber(next)
+        {
+            var treeElement = section.findTreeElementWithName("-webkit-transform");
+            treeElement.startEditing(treeElement.valueElement);
+            var selection = window.getSelection();
+            var range = selection.getRangeAt(0);
+            var newRange = document.createRange();
+            newRange.setStart(range.startContainer, 10);
+            newRange.setEnd(range.startContainer, 10);
+            selection.removeAllRanges();
+            selection.addRange(newRange);
+            treeElement.valueElement.dispatchEvent(InspectorTest.createKeyEvent("Up"));
+            treeElement.valueElement.dispatchEvent(InspectorTest.createKeyEvent("PageUp"));
+            InspectorTest.addResult(treeElement.listItemElement.textContent);
+            next();
         }
     ]);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-17  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Increment/decrement of very big CSS numeric values results in invalid CSS
+        https://bugs.webkit.org/show_bug.cgi?id=60890
+
+        * inspector/front-end/MetricsSidebarPane.js:
+        (WebInspector.MetricsSidebarPane.prototype._handleKeyDown):
+        * inspector/front-end/StylesSidebarPane.js:
+        (WebInspector.StylesSidebarPane.alteredFloatNumber):
+        (WebInspector.StylePropertyTreeElement.prototype):
+
 2011-05-17  Pavel Podivilov  <podivilov@chromium.org>
 

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

@@ -306 +306 @@
             suffix = matches[3];
             number = WebInspector.StylesSidebarPane.alteredFloatNumber(parseFloat(matches[2]), event);
+            if (number === null) {
+                // Need to check for null explicitly.
+                return;
+            }
+
             if (styleProperty !== "margin" && number < 0)
                 number = 0;

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

@@ -111 +111 @@
 ];
 
+WebInspector.StylesSidebarPane.CSSNumberRegex = /^(-?(?:\d+(?:\.\d+)?|\.\d+))$/;
+
 WebInspector.StylesSidebarPane.alteredFloatNumber = function(number, event)
 {
@@ -144 +146 @@
         // Use the Number constructor to forget the fixed precision, so 1.100000 will print as 1.1.
         result = Number((number + changeAmount).toFixed(6));
+        if (!String(result).match(WebInspector.StylesSidebarPane.CSSNumberRegex))
+            return null;
     }
 
@@ -1758 +1762 @@
                 suffix = matches[3];
                 number = WebInspector.StylesSidebarPane.alteredFloatNumber(parseFloat(matches[2]), event);
+                if (number === null) {
+                    // Need to check for null explicitly.
+                    return false;
+                }
 
                 replacementString = prefix + number + suffix;