Changeset 129122 in webkit

Timestamp:

Sep 20, 2012 5:44:51 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: setPropertyValue does not work for non-finite numbers
​https://bugs.webkit.org/show_bug.cgi?id=97016

Patch by Andrey Adaikin <​aandrey@chromium.org> on 2012-09-20
Reviewed by Vsevolod Vlasov.

Source/WebCore:

Fix: setting a property to NaN, Infinity or -Infinity numbers did not work.

• inspector/front-end/RemoteObject.js:

(WebInspector.RemoteObject.prototype.setPropertyValue):

LayoutTests:

Expands the test with non-finite numbers case.

• inspector/runtime/runtime-setPropertyValue-expected.txt:
• inspector/runtime/runtime-setPropertyValue.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/runtime/runtime-setPropertyValue-expected.txt (modified) (2 diffs)
• LayoutTests/inspector/runtime/runtime-setPropertyValue.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/RemoteObject.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-20  Andrey Adaikin  <aandrey@chromium.org>
+
+        Web Inspector: setPropertyValue does not work for non-finite numbers
+        https://bugs.webkit.org/show_bug.cgi?id=97016
+
+        Reviewed by Vsevolod Vlasov.
+
+        Expands the test with non-finite numbers case.
+
+        * inspector/runtime/runtime-setPropertyValue-expected.txt:
+        * inspector/runtime/runtime-setPropertyValue.html:
+
 2012-09-20  Marcelo Lira  <marcelo.lira@openbossa.org>
 

trunk/LayoutTests/inspector/runtime/runtime-setPropertyValue-expected.txt

@@ -23 +23 @@
 CONSOLE MESSAGE: line 12: {"foo":""}
 CONSOLE MESSAGE: line 13: 
+CONSOLE MESSAGE: line 11: ===== Set non-finite numbers =====
+CONSOLE MESSAGE: line 12: {"foo":"NaN","foo1":"Infinity","foo2":"-Infinity"}
+CONSOLE MESSAGE: line 13: 
 Tests WebInspector.RemoveObject.setPropertyValue implementation.
 
@@ -43 +46 @@
 exception
 
+Running: testSetNonFiniteNumbers
+

trunk/LayoutTests/inspector/runtime/runtime-setPropertyValue.html

@@ -10 +10 @@
 {
     console.log("===== " + label + " =====");
-    console.log(JSON.stringify(object1));
+    console.log(JSON.stringify(object1, replacer));
     console.log("");
+
+    function replacer(key, value)
+    {
+        if (typeof value === "number" && !isFinite(value))
+            return String(value);
+        return value;
+    }
 }
 
@@ -110 +117 @@
                 InspectorTest.evaluateInPage("dumpObject('Set exception')", next);
             }
+        },
+
+        function testSetNonFiniteNumbers(next)
+        {
+            obj1.setPropertyValue("foo", "NaN", step1);
+
+            function step1(error)
+            {
+                obj1.setPropertyValue("foo1", "Infinity", step2);
+            }
+
+            function step2(error)
+            {
+                obj1.setPropertyValue("foo2", "-Infinity", step3);
+            }
+
+            function step3(error)
+            {
+                InspectorTest.evaluateInPage("dumpObject('Set non-finite numbers')", next);
+            }
         }
     ]);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-20  Andrey Adaikin  <aandrey@chromium.org>
+
+        Web Inspector: setPropertyValue does not work for non-finite numbers
+        https://bugs.webkit.org/show_bug.cgi?id=97016
+
+        Reviewed by Vsevolod Vlasov.
+
+        Fix: setting a property to NaN, Infinity or -Infinity numbers did not work.
+
+        * inspector/front-end/RemoteObject.js:
+        (WebInspector.RemoteObject.prototype.setPropertyValue):
+
 2012-09-20  Otto Derek Cheung  <otcheung@rim.com>
 

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

@@ -242 +242 @@
             }
 
-            function setPropertyValue(propertyName, propertyValue)
-            {
-                this[propertyName] = propertyValue;
-            }
+            var setPropertyValueFunction = "function(a, b) { this[a] = b; }";
+
+            // Special case for NaN, Infinity and -Infinity
+            if (result.type === "number" && typeof result.value !== "number")
+                setPropertyValueFunction = "function(a) { this[a] = " + result.description + "; }";
 
             delete result.description; // Optimize on traffic.
-            RuntimeAgent.callFunctionOn(this._objectId, setPropertyValue.toString(), [{ value:name }, result], true, undefined, propertySetCallback.bind(this));
+            RuntimeAgent.callFunctionOn(this._objectId, setPropertyValueFunction, [{ value:name }, result], true, undefined, propertySetCallback.bind(this));
             if (result._objectId)
                 RuntimeAgent.releaseObject(result._objectId);