diff options
Diffstat (limited to 'WebCore/inspector/front-end/InjectedScript.js')
| -rw-r--r-- | WebCore/inspector/front-end/InjectedScript.js | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/WebCore/inspector/front-end/InjectedScript.js b/WebCore/inspector/front-end/InjectedScript.js index 26495e8..5d9d065 100644 --- a/WebCore/inspector/front-end/InjectedScript.js +++ b/WebCore/inspector/front-end/InjectedScript.js @@ -121,27 +121,6 @@ InjectedScript.getProperties = function(objectProxy, ignoreHasOwnProperty, abbre if (!ignoreHasOwnProperty && object.__proto__) propertyNames.push("__proto__"); - if (jsEngine === "v8") { - // Check if the object is a scope. - if (InjectedScript._isScopeProxy(objectProxy)) { - propertyNames = []; - for (var name in object) - propertyNames.push(name); - } else { - // FIXME(http://crbug.com/41243): Object.getOwnPropertyNames may return duplicated names. - var a = []; - propertyNames.sort(); - var prev; - for (var i = 0; i < propertyNames.length; i++) { - var n = propertyNames[i]; - if (n != prev) - a.push(n); - prev = n; - } - propertyNames = a; - } - } - // Go over properties, prepare results. for (var i = 0; i < propertyNames.length; ++i) { var propertyName = propertyNames[i]; @@ -171,12 +150,6 @@ InjectedScript.getProperties = function(objectProxy, ignoreHasOwnProperty, abbre return properties; } -InjectedScript._isScopeProxy = function(objectProxy) -{ - var objectId = objectProxy.objectId; - return typeof objectId === "object" && !objectId.thisObject; -} - InjectedScript.setPropertyValue = function(objectProxy, propertyName, expression) { var object = InjectedScript._resolveObject(objectProxy); @@ -217,7 +190,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) { } } |