Changeset 53945 in webkit

Timestamp:

Jan 27, 2010 11:30:19 AM (14 years ago)

Author:

yurys@chromium.org

Message:

2010-01-27 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Oliver Hunt.

Instead of relying on Object.prototype.toString result use JSObject::isActivationObject
to check if a scope node is a JSActivation. Object.prototype.toString for JSActivation
will call JSActivation::toThisObject whose result depends on the current call stack.

​https://bugs.webkit.org/show_bug.cgi?id=34161

Test: WebCore/manual-tests/inspector/debugger-scopes-inspection.html

• bindings/js/JSInjectedScriptHostCustom.cpp: (WebCore::JSInjectedScriptHost::isActivation):
• inspector/InjectedScriptHost.idl:
• inspector/front-end/InjectedScript.js: (injectedScriptConstructor.):
• manual-tests/inspector/debugger-scopes-inspection.html: Added.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSInjectedScriptHostCustom.cpp (modified) (1 diff)
• inspector/InjectedScriptHost.idl (modified) (1 diff)
• inspector/front-end/InjectedScript.js (modified) (1 diff)
• manual-tests/inspector/debugger-scopes-inspection.html (added)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-27  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Oliver Hunt.
+
+        Instead of relying on Object.prototype.toString result use JSObject::isActivationObject
+        to check if a scope node is a JSActivation. Object.prototype.toString for JSActivation
+        will call JSActivation::toThisObject whose result depends on the current call stack.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34161
+
+        Test: WebCore/manual-tests/inspector/debugger-scopes-inspection.html
+
+        * bindings/js/JSInjectedScriptHostCustom.cpp:
+        (WebCore::JSInjectedScriptHost::isActivation):
+        * inspector/InjectedScriptHost.idl:
+        * inspector/front-end/InjectedScript.js:
+        (injectedScriptConstructor.):
+        * manual-tests/inspector/debugger-scopes-inspection.html: Added.
+
 2010-01-27 Anton Muhin <antonm@google.com>
         Review by Adam Barth.

trunk/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp

@@ -127 +127 @@
 }
 
+JSValue JSInjectedScriptHost::isActivation(ExecState* exec, const ArgList& args)
+{
+    if (args.size() < 1)
+        return jsUndefined();
+
+    JSValue value = args.at(0);
+    if (!value.isObject())
+        return jsBoolean(false);
+
+    JSObject* object = value.toObject(exec);
+    return jsBoolean(object->isActivationObject());
+}
+
 #endif
 

trunk/WebCore/inspector/InjectedScriptHost.idl

@@ -44 +44 @@
 #if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER
         [Custom] DOMObject currentCallFrame();
+        [Custom] boolean isActivation(in DOMObject object);
 #endif
 

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

@@ -1183 +1183 @@
             var scopeObjectProxy = InjectedScript.createProxyObject(scopeObject, { callFrame: this.id, chainIndex: i }, true);
 
-            if (Object.prototype.toString.call(scopeObject) === "[object JSActivation]") {
+            if (InjectedScriptHost.isActivation(scopeObject)) {
                 if (!foundLocalScope)
                     scopeObjectProxy.thisObject = InjectedScript.createProxyObject(callFrame.thisObject, { callFrame: this.id, thisObject: true }, true);