[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit aed4d3838b92519a747d07acb26dc3fc90609eb1
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 15 13:56:46 2010 +0000

    2010-02-15  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed, Chromium tests fix (force conversion of property names to
            strings in Web Inspector's injected script).
    
            * inspector/front-end/InjectedScript.js:
            (injectedScriptConstructor):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54774 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index df47cb0..71a4c2c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-02-15  Pavel Feldman  <pfeldman at chromium.org>
 
+        Not reviewed, Chromium build fix (force conversion of property names to
+        strings in Web Inspector's injected script).
+
+        * inspector/front-end/InjectedScript.js:
+        (injectedScriptConstructor):
+
+2010-02-15  Pavel Feldman  <pfeldman at chromium.org>
+
         Not reviewed: touch InspectorController in order to kick win bot tests
         with new injected script contents.
 
diff --git a/WebCore/inspector/front-end/InjectedScript.js b/WebCore/inspector/front-end/InjectedScript.js
index 44cc3b1..20e440a 100644
--- a/WebCore/inspector/front-end/InjectedScript.js
+++ b/WebCore/inspector/front-end/InjectedScript.js
@@ -496,7 +496,7 @@ InjectedScript.getProperties = function(objectProxy, ignoreHasOwnProperty, abbre
         var propertyName = propertyNames[i];
 
         var property = {};
-        property.name = propertyName;
+        property.name = propertyName + "";
         property.parentObjectProxy = objectProxy;
         var isGetter = object["__lookupGetter__"] && object.__lookupGetter__(propertyName);
         if (!property.isGetter) {
@@ -584,7 +584,7 @@ InjectedScript._populatePropertyNames = function(object, resultSet)
         try {
             var names = Object.getOwnPropertyNames(o);
             for (var i = 0; i < names.length; ++i)
-                resultSet[names[i]] = true;
+                resultSet[names[i] + ""] = true;
         } catch (e) {
         }
     }

-- 
WebKit Debian packaging