Imported WebKit commit 6dbad7b03986b50773637200cddddeeeb92745cc (http://svn.webkit.org/repository/webkit/trunk@129129)

Another update that should fix the initial build in the CI system

2 files changed, 18 insertions, 5 deletions

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 1d3aa8f4b..5ad2101fa 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+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>
 
         Web Inspector: Cookie info in Network Resources Cookies tab are incorrect
diff --git a/Source/WebCore/inspector/front-end/RemoteObject.js b/Source/WebCore/inspector/front-end/RemoteObject.js
index f538738e1..324f4edb5 100644
--- a/Source/WebCore/inspector/front-end/RemoteObject.js
+++ b/Source/WebCore/inspector/front-end/RemoteObject.js
@@ -241,13 +241,14 @@ WebInspector.RemoteObject.prototype = {
                 return;
             }
 
-            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);
         }