Changeset 207784 in webkit

Timestamp:

Oct 24, 2016 3:09:29 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Scope chain shouldn't show empty Closure sections
​https://bugs.webkit.org/show_bug.cgi?id=152348

Patch by Devin Rousso <Devin Rousso> on 2016-10-24
Reviewed by Joseph Pecoraro.

Source/JavaScriptCore:

• inspector/InjectedScriptSource.js:

(isEmptyObject):
(InjectedScript.CallFrameProxy._createScopeJson):
If the scope object has no properties, set empty to true.

• inspector/protocol/Debugger.json:

Added empty property to Scope type.

Source/WebInspectorUI:

• UserInterface/Controllers/DebuggerManager.js:

(WebInspector.DebuggerManager.prototype._scopeChainNodeFromPayload):

• UserInterface/Models/ScopeChainNode.js:

(WebInspector.ScopeChainNode):
(WebInspector.ScopeChainNode.prototype.get empty):
Added support for new empty property.

• UserInterface/Views/ScopeChainDetailsSidebarPanel.js:

(WebInspector.ScopeChainDetailsSidebarPanel.prototype._generateCallFramesSection):
Only create and display a DetailsSection if the scope is not empty (via empty).

LayoutTests:

• inspector/model/scope-chain-node-expected.txt:
• inspector/model/scope-chain-node.html:

Added "empty" indicators to scopes without any property descriptors.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/model/scope-chain-node-expected.txt (modified) (7 diffs)
• LayoutTests/inspector/model/scope-chain-node.html (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/inspector/InjectedScriptSource.js (modified) (3 diffs)
• Source/JavaScriptCore/inspector/protocol/Debugger.json (modified) (1 diff)
• Source/WebInspectorUI/ChangeLog (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Models/ScopeChainNode.js (modified) (3 diffs)
• Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-24  Devin Rousso  <dcrousso+webkit@gmail.com>
+
+        Web Inspector: Scope chain shouldn't show empty Closure sections
+        https://bugs.webkit.org/show_bug.cgi?id=152348
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/model/scope-chain-node-expected.txt:
+        * inspector/model/scope-chain-node.html:
+        Added "empty" indicators to scopes without any property descriptors.
+
 2016-10-24  Devin Rousso  <dcrousso+webkit@gmail.com>
 

trunk/LayoutTests/inspector/model/scope-chain-node-expected.txt

@@ -56 +56 @@
 SCOPE CHAIN:
     Closure
+      (empty)
     FunctionName
       - functionName: function functionName() {
     Closure
+      (empty)
     GlobalLexicalEnvironment
       - lexicalGlobalVariable: 2
@@ -66 +68 @@
 SCOPE CHAIN:
     Closure
+      (empty)
     Block
       - MyClass: class MyClass
     Closure
+      (empty)
     GlobalLexicalEnvironment
       - lexicalGlobalVariable: 2
@@ -102 +106 @@
       - a: 1
     Closure
+      (empty)
     GlobalLexicalEnvironment
       - lexicalGlobalVariable: 2
@@ -108 +113 @@
 SCOPE CHAIN:
     Closure
+      (empty)
     Block
       - MyClass: class MyClass
@@ -113 +119 @@
       - a: 1
     Closure
+      (empty)
     GlobalLexicalEnvironment
       - lexicalGlobalVariable: 2
@@ -119 +126 @@
 SCOPE CHAIN:
     Closure
+      (empty)
     Block
       - MyClassWithStaticMethod: class MyClassWithStaticMethod
@@ -124 +132 @@
       - a: 1
     Closure
+      (empty)
     GlobalLexicalEnvironment
       - lexicalGlobalVariable: 2

trunk/LayoutTests/inspector/model/scope-chain-node.html

@@ -46 +46 @@
             for (let {scope, propertyDescriptors} of results) {
                 InspectorTest.log(`    ${scopeTypeToString(scope.type)}`);
-                if (scope.type !== WebInspector.ScopeChainNode.Type.Global) {
-                    for (let descriptor of propertyDescriptors)
-                        InspectorTest.log(`      - ${descriptor.name}: ${firstLine(descriptor.value.description)}`);
+                if (scope.type === WebInspector.ScopeChainNode.Type.Global)
+                    continue;
+
+                if (!propertyDescriptors.length) {
+                    InspectorTest.assert(scope.empty, "Scope should be empty if there are no property descriptors.");
+                    InspectorTest.log("      (empty)");
+                    continue;
                 }
+
+                for (let descriptor of propertyDescriptors)
+                    InspectorTest.log(`      - ${descriptor.name}: ${firstLine(descriptor.value.description)}`);
             }
             return results;

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-10-24  Devin Rousso  <dcrousso+webkit@gmail.com>
+
+        Web Inspector: Scope chain shouldn't show empty Closure sections
+        https://bugs.webkit.org/show_bug.cgi?id=152348
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/InjectedScriptSource.js:
+        (isEmptyObject):
+        (InjectedScript.CallFrameProxy._createScopeJson):
+        If the scope object has no properties, set empty to true.
+
+        * inspector/protocol/Debugger.json:
+        Added empty property to Scope type.
+
 2016-10-24  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js

@@ -69 +69 @@
 }
 
+function isEmptyObject(object)
+{
+    for (let key in object)
+        return false;
+    return true;
+}
+
 var InjectedScript = function()
 {
@@ -1336 +1343 @@
 InjectedScript.CallFrameProxy._createScopeJson = function(object, {name, type, location}, groupId)
 {
-    var scope = {
+    let scope = {
         object: injectedScript._wrapObject(object, groupId),
         type: InjectedScript.CallFrameProxy._scopeTypeNames[type],
@@ -1343 +1350 @@
     if (name)
         scope.name = name;
+
     if (location)
         scope.location = location;
+
+    if (isEmptyObject(object))
+        scope.empty = true;
 
     return scope;

trunk/Source/JavaScriptCore/inspector/protocol/Debugger.json

@@ -85 +85 @@
                 { "name": "type", "type": "string", "enum": ["global", "with", "closure", "catch", "functionName", "globalLexicalEnvironment", "nestedLexical"], "description": "Scope type." },
                 { "name": "name", "type": "string", "optional": true, "description": "Name associated with the scope." },
-                { "name": "location", "$ref": "Location", "optional": true, "description": "Location if available of the scope definition." }
+                { "name": "location", "$ref": "Location", "optional": true, "description": "Location if available of the scope definition." },
+                { "name": "empty", "type": "boolean", "optional": true, "description": "Whether the scope has any variables." }
             ],
             "description": "Scope description."

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-10-24  Devin Rousso  <dcrousso+webkit@gmail.com>
+
+        Web Inspector: Scope chain shouldn't show empty Closure sections
+        https://bugs.webkit.org/show_bug.cgi?id=152348
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Controllers/DebuggerManager.js:
+        (WebInspector.DebuggerManager.prototype._scopeChainNodeFromPayload):
+        * UserInterface/Models/ScopeChainNode.js:
+        (WebInspector.ScopeChainNode):
+        (WebInspector.ScopeChainNode.prototype.get empty):
+        Added support for new empty property.
+
+        * UserInterface/Views/ScopeChainDetailsSidebarPanel.js:
+        (WebInspector.ScopeChainDetailsSidebarPanel.prototype._generateCallFramesSection):
+        Only create and display a DetailsSection if the scope is not empty (via empty).
+
 2016-10-24  Devin Rousso  <dcrousso+webkit@gmail.com>
 

trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js

@@ -687 +687 @@
         }
 
-        var object = WebInspector.RemoteObject.fromPayload(payload.object);
-        return new WebInspector.ScopeChainNode(type, [object], payload.name, payload.location);
+        let object = WebInspector.RemoteObject.fromPayload(payload.object);
+        return new WebInspector.ScopeChainNode(type, [object], payload.name, payload.location, payload.empty);
     }
 

trunk/Source/WebInspectorUI/UserInterface/Models/ScopeChainNode.js

@@ -26 +26 @@
 WebInspector.ScopeChainNode = class ScopeChainNode extends WebInspector.Object
 {
-    constructor(type, objects, name, location)
+    constructor(type, objects, name, location, empty)
     {
         super();
@@ -40 +40 @@
         this._name = name || "";
         this._location = location || null;
+        this._empty = empty || false;
     }
 
@@ -48 +49 @@
     get name() { return this._name; }
     get location() { return this._location; }
+    get empty() { return this._empty; }
 
     get hash()

trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js

@@ -169 +169 @@
         let scopeChain = callFrame.mergedScopeChain();
         for (let scope of scopeChain) {
+            // Don't show sections for empty scopes unless it is the local scope, since it has "this".
+            if (scope.empty && scope.type !== WebInspector.ScopeChainNode.Type.Local)
+                continue;
+
             let title = null;
             let extraPropertyDescriptor = null;