Changeset 53192 in webkit

Timestamp:

Jan 13, 2010 10:14:16 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-13 Kent Hansen <​kent.hansen@nokia.com>

Reviewed by Timothy Hatcher.

Some objects in the global scope are not completed
​https://bugs.webkit.org/show_bug.cgi?id=19119

Use Object.getOwnPropertyNames instead of for-in to provide completions, since
Object.getOwnPropertyNames reports both enumerable and non-enumerable properties.

• inspector/front-end/InjectedScript.js: (InjectedScript._getPropertyNames): (InjectedScript.getCompletions):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/InjectedScript.js (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-13  Kent Hansen  <kent.hansen@nokia.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Some objects in the global scope are not completed
+        https://bugs.webkit.org/show_bug.cgi?id=19119
+
+        Use Object.getOwnPropertyNames instead of for-in to provide completions, since
+        Object.getOwnPropertyNames reports both enumerable and non-enumerable properties.
+
+        * inspector/front-end/InjectedScript.js:
+        (InjectedScript._getPropertyNames):
+        (InjectedScript.getCompletions):
+
 2010-01-13  Ben Murdoch  <benm@google.com>
 

trunk/WebCore/inspector/front-end/InjectedScript.js

@@ -534 +534 @@
 }
 
+InjectedScript._getPropertyNames = function(object, resultSet)
+{
+    for (var o = object; o; o = o.__proto__) {
+        try {
+            var names = Object.getOwnPropertyNames(o);
+            for (var i = 0; i < names.length; ++i)
+                resultSet[names[i]] = true;
+        } catch (e) {
+        }
+    }
+}
+
 InjectedScript.getCompletions = function(expression, includeInspectorCommandLineAPI, callFrameId)
 {
@@ -549 +561 @@
                 // Evaluate into properties in scope of the selected call frame.
                 var scopeChain = callFrame.scopeChain;
-                for (var i = 0; i < scopeChain.length; ++i) {
-                    var scopeObject = scopeChain[i];
-                    try {
-                        for (var propertyName in scopeObject)
-                            props[propertyName] = true;
-                    } catch (e) {
-                    }
-                }
+                for (var i = 0; i < scopeChain.length; ++i)
+                    InjectedScript._getPropertyNames(scopeChain[i], props);
             }
         } else {
@@ -563 +569 @@
             expressionResult = InjectedScript._evaluateOn(InjectedScript._window().eval, InjectedScript._window(), expression);
         }
-        if (expressionResult)
-            for (var prop in expressionResult)
-                props[prop] = true;
+        if (typeof expressionResult == "object")
+            InjectedScript._getPropertyNames(expressionResult, props);
         if (includeInspectorCommandLineAPI)
             for (var prop in InjectedScript._window().console._inspectorCommandLineAPI)