Changeset 86835 in webkit

Timestamp:

May 19, 2011 4:09:24 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-05-19 Pavel Feldman <​pfeldman@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: make "this" a part of callFrame, not scope in the protocol.
​https://bugs.webkit.org/show_bug.cgi?id=61057

• inspector/InjectedScriptSource.js:
• inspector/Inspector.json:
• inspector/front-end/ScopeChainSidebarPane.js: (WebInspector.ScopeChainSidebarPane.prototype.update):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InjectedScriptSource.js (modified) (2 diffs)
• inspector/Inspector.json (modified) (2 diffs)
• inspector/front-end/DebuggerPresentationModel.js (modified) (1 diff)
• inspector/front-end/ScopeChainSidebarPane.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-19  Pavel Feldman  <pfeldman@google.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: make "this" a part of callFrame, not scope in the protocol.
+        https://bugs.webkit.org/show_bug.cgi?id=61057
+
+        * inspector/InjectedScriptSource.js:
+        * inspector/Inspector.json:
+        * inspector/front-end/ScopeChainSidebarPane.js:
+        (WebInspector.ScopeChainSidebarPane.prototype.update):
+
 2011-05-19  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/inspector/InjectedScriptSource.js

@@ -457 +457 @@
     this.location = { sourceId: String(callFrame.sourceID), lineNumber: callFrame.line, columnNumber: callFrame.column };
     this.scopeChain = this._wrapScopeChain(callFrame);
+    this.this = injectedScript._wrapObject(callFrame.thisObject, "backtrace");
 }
 
@@ -484 +485 @@
             var scopeType = callFrame.scopeType(i);
             scope.type = scopeTypeNames[scopeType];
-
-            if (scopeType === LOCAL_SCOPE)
-                scope.this = injectedScript._wrapObject(callFrame.thisObject, "backtrace");
-
             scopeChainProxy.push(scope);
         }

trunk/Source/WebCore/inspector/Inspector.json

@@ -1355 +1355 @@
                     { "name": "functionName", "type": "string", "description": "Name of the function called on this frame." },
                     { "name": "location", "$ref": "Location", "description": "Location in the source code." },
-                    { "name": "scopeChain", "type": "array", "items": { "$ref": "Scope" }, "description": "Scope chain for given call frame." }
+                    { "name": "scopeChain", "type": "array", "items": { "$ref": "Scope" }, "description": "Scope chain for given call frame." },
+                    { "name": "this", "$ref": "Runtime.RemoteObject", "description": "<code>this</code> object for this call frame." }
                 ],
                 "description": "Debugger call frame. Array of call frames form call stack."
@@ -1364 +1365 @@
                 "properties": [
                     { "name": "type", "type": "string", "enum": ["global", "local", "with", "closure", "catch"], "description": "Scope type." },
-                    { "name": "object", "$ref": "Runtime.RemoteObject", "description": "Object representing the scope." },
-                    { "name": "this", "$ref": "Runtime.RemoteObject", "optional": true, "description": "<code>this</code> object for local scope." }
+                    { "name": "object", "$ref": "Runtime.RemoteObject", "description": "Object representing the scope." }
                 ],
                 "description": "Debugger call frame. Array of call frames form call stack."

trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js

@@ -685 +685 @@
     },
 
+    get this()
+    {
+        return this._callFrame.this;
+    },
+
     get index()
     {

trunk/Source/WebCore/inspector/front-end/ScopeChainSidebarPane.js

@@ -73 +73 @@
                     emptyPlaceholder = WebInspector.UIString("No Variables");
                     subtitle = null;
-                    if (scope.this)
-                        extraProperties = [ new WebInspector.RemoteObjectProperty("this", WebInspector.RemoteObject.fromPayload(scope.this)) ];
+                    if (callFrame.this)
+                        extraProperties = [ new WebInspector.RemoteObjectProperty("this", WebInspector.RemoteObject.fromPayload(callFrame.this)) ];
                     if (i == 0) {
                         var exception = WebInspector.debuggerModel.debuggerPausedDetails.exception;