Changeset 48024 in webkit

Timestamp:

Sep 3, 2009 9:54:49 AM (15 years ago)

Author:

pfeldman@chromium.org

Message:

2009-09-03 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

WebInspector: Do not query non-function call frames for function name.

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

• inspector/front-end/InjectedScript.js: (InjectedScript.CallFrameProxy): (InjectedScript.CallFrameProxy.prototype._wrapScopeChain):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-03  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        WebInspector: Do not query non-function call frames for function name.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28799
+
+        * inspector/front-end/InjectedScript.js:
+        (InjectedScript.CallFrameProxy):
+        (InjectedScript.CallFrameProxy.prototype._wrapScopeChain):
+
 2009-09-03  Pavel Feldman  <pfeldman@chromium.org>
 

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

@@ -959 +959 @@
     this.id = id;
     this.type = callFrame.type;
-    this.functionName = callFrame.functionName;
+    this.functionName = (this.type === "function" ? callFrame.functionName : "");
     this.sourceID = callFrame.sourceID;
     this.line = callFrame.line;
@@ -974 +974 @@
             var scopeObject = scopeChain[i];
             var scopeObjectProxy = InjectedScript.createProxyObject(scopeObject, { callFrame: this.id, chainIndex: i });
+
             if (Object.prototype.toString.call(scopeObject) === "[object JSActivation]") {
                 if (!foundLocalScope)
@@ -985 +986 @@
             else if (foundLocalScope && scopeObject instanceof InjectedScript._window().Document)
                 scopeObjectProxy.isDocument = true;
-            else if (!foundLocalScope && !localScope)
+            else if (!foundLocalScope)
                 scopeObjectProxy.isWithBlock = true;
             scopeObjectProxy.properties = [];