Changeset 58166 in webkit

Timestamp:

Apr 23, 2010 8:02:02 AM (14 years ago)

Author:

yurys@chromium.org

Message:

2010-04-23 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: provide JSC implementation for scopeType method on
call frame and use same jsvascript code for JSC and v8 when collecting
scope chain data.

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

• bindings/js/JSInjectedScriptHostCustom.cpp: (WebCore::JSInjectedScriptHost::currentCallFrame):
• bindings/js/JSJavaScriptCallFrameCustom.cpp: (WebCore::JSJavaScriptCallFrame::scopeType):
• bindings/v8/custom/V8InjectedScriptHostCustom.cpp: (WebCore::V8InjectedScriptHost::currentCallFrameCallback):
• inspector/InjectedScriptHost.idl:
• inspector/front-end/InjectedScript.js: (injectedScriptConstructor.):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSInjectedScriptHostCustom.cpp (modified) (1 diff)
• bindings/js/JSJavaScriptCallFrameCustom.cpp (modified) (1 diff)
• bindings/v8/custom/V8InjectedScriptHostCustom.cpp (modified) (1 diff)
• inspector/InjectedScriptHost.idl (modified) (1 diff)
• inspector/front-end/InjectedScript.js (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-23  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: provide JSC implementation for scopeType method on
+        call frame and use same jsvascript code for JSC and v8 when collecting
+        scope chain data.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37663
+
+        * bindings/js/JSInjectedScriptHostCustom.cpp:
+        (WebCore::JSInjectedScriptHost::currentCallFrame):
+        * bindings/js/JSJavaScriptCallFrameCustom.cpp:
+        (WebCore::JSJavaScriptCallFrame::scopeType):
+        * bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
+        (WebCore::V8InjectedScriptHost::currentCallFrameCallback):
+        * inspector/InjectedScriptHost.idl:
+        * inspector/front-end/InjectedScript.js:
+        (injectedScriptConstructor.):
+
 2010-04-23  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp

@@ -130 +130 @@
     return toJS(exec, callFrame);
 }
-
-JSValue JSInjectedScriptHost::isActivation(ExecState*, const ArgList& args)
-{
-    JSObject* object = args.at(0).getObject();
-    return jsBoolean(object && object->isActivationObject());
-}
 #endif
 

trunk/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp

@@ -86 +86 @@
 }
 
-JSValue JSJavaScriptCallFrame::scopeType(ExecState*, const ArgList&)
+JSValue JSJavaScriptCallFrame::scopeType(ExecState* exec, const ArgList& args)
 {
-    // FIXME(37663): implement this method the way it's done in the InjectedScipt.js
-    return jsNull();
+    if (!impl()->scopeChain())
+        return jsUndefined();
+
+    if (!args.at(0).isInt32())
+        return jsUndefined();
+    int index = args.at(0).asInt32();
+
+    const ScopeChainNode* scopeChain = impl()->scopeChain();
+    ScopeChainIterator end = scopeChain->end();
+
+    bool foundLocalScope = false;
+    for (ScopeChainIterator iter = scopeChain->begin(); iter != end; ++iter) {
+        JSObject* scope = *iter;
+        if (scope->isActivationObject()) {
+            if (!foundLocalScope) {
+                // First activation object is local scope, each successive activation object is closure.
+                if (!index)
+                    return jsJavaScriptCallFrameLOCAL_SCOPE(exec, JSValue(), Identifier());
+                foundLocalScope = true;
+            } else if (!index)
+                return jsJavaScriptCallFrameCLOSURE_SCOPE(exec, JSValue(), Identifier());
+        }
+
+        if (!index) {
+            // Last in the chain is global scope.
+            if (++iter == end)
+                return jsJavaScriptCallFrameGLOBAL_SCOPE(exec, JSValue(), Identifier());
+            return jsJavaScriptCallFrameWITH_SCOPE(exec, JSValue(), Identifier());
+        }
+
+        --index;
+    }
+    return jsUndefined();
 }
 

trunk/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp

@@ -162 +162 @@
     return toV8(ScriptDebugServer::shared().currentCallFrame());
 }
-
-v8::Handle<v8::Value> V8InjectedScriptHost::isActivationCallback(const v8::Arguments& args)
-{
-    INC_STATS("InjectedScriptHost.isActivation()");
-    return v8::Boolean::New(true);
-}
 #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

@@ -842 +842 @@
 }
 
-// FIXME(37663): unify scope chain representation and remove this if.
-if (jsEngine === "v8") {
-
 InjectedScript.CallFrameProxy.prototype = {
     _wrapScopeChain: function(callFrame)
@@ -856 +853 @@
         var scopeChain = callFrame.scopeChain;
         var scopeChainProxy = [];
+        var foundLocalScope = false;
         for (var i = 0; i < scopeChain.length; i++) {
             var scopeType = callFrame.scopeType(i);
@@ -861 +859 @@
             var scopeObjectProxy = InjectedScript.createProxyObject(scopeObject, { callFrame: this.id, chainIndex: i }, true);
 
-            var foundLocalScope = false;
             switch(scopeType) {
                 case LOCAL_SCOPE: {
@@ -875 +872 @@
                 case WITH_SCOPE:
                 case CATCH_SCOPE: {
-                    scopeObjectProxy.isWithBlock = true;
+                    if (foundLocalScope && scopeObject instanceof inspectedWindow.Element)
+                        scopeObjectProxy.isElement = true;
+                    else if (foundLocalScope && scopeObject instanceof inspectedWindow.Document)
+                        scopeObjectProxy.isDocument = true;
+                    else
+                        scopeObjectProxy.isWithBlock = true;
                     break;
                 }
             }
-
-            if (foundLocalScope) {
-                if (scopeObject instanceof inspectedWindow.Element)
-                    scopeObjectProxy.isElement = true;
-                else if (scopeObject instanceof inspectedWindow.Document)
-                    scopeObjectProxy.isDocument = true;
-            }
- 
             scopeChainProxy.push(scopeObjectProxy);
         }
         return scopeChainProxy;
     }
-}
-
-} else {
-
-InjectedScript.CallFrameProxy.prototype = {
-    _wrapScopeChain: function(callFrame)
-    {
-        var foundLocalScope = false;
-        var scopeChain = callFrame.scopeChain;
-        var scopeChainProxy = [];
-        for (var i = 0; i < scopeChain.length; ++i) {
-            var scopeObject = scopeChain[i];
-            var scopeObjectProxy = InjectedScript.createProxyObject(scopeObject, { callFrame: this.id, chainIndex: i }, true);
-
-            if (InjectedScriptHost.isActivation(scopeObject)) {
-                if (!foundLocalScope)
-                    scopeObjectProxy.thisObject = InjectedScript.createProxyObject(callFrame.thisObject, { callFrame: this.id, thisObject: true }, true);
-                else
-                    scopeObjectProxy.isClosure = true;
-                foundLocalScope = true;
-                scopeObjectProxy.isLocal = true;
-            } else if (foundLocalScope && scopeObject instanceof inspectedWindow.Element)
-                scopeObjectProxy.isElement = true;
-            else if (foundLocalScope && scopeObject instanceof inspectedWindow.Document)
-                scopeObjectProxy.isDocument = true;
-            else if (!foundLocalScope)
-                scopeObjectProxy.isWithBlock = true;
-            scopeChainProxy.push(scopeObjectProxy);
-        }
-        return scopeChainProxy;
-    }
-}
-
 }