Changeset 194259 in webkit

Timestamp:

Dec 17, 2015, 8:18:01 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Remove "local" scope type from the protocol
​https://bugs.webkit.org/show_bug.cgi?id=152409

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-12-17
Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

After r194251 the backend no longer sends this scope type.
So remove it from the protocol.

The concept of a Local Scope should be calculatable by the
frontend. In fact the way the backend used to do this could
easily be done by the frontend. To be done in a follow-up.

• inspector/InjectedScriptSource.js:
• inspector/JSJavaScriptCallFrame.h:
• inspector/protocol/Debugger.json:

Source/WebInspectorUI:

• UserInterface/Controllers/DebuggerManager.js:

(WebInspector.DebuggerManager.prototype._scopeChainNodeFromPayload):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/inspector/InjectedScriptSource.js (modified) (1 diff)
• JavaScriptCore/inspector/JSJavaScriptCallFrame.h (modified) (1 diff)
• JavaScriptCore/inspector/protocol/Debugger.json (modified) (1 diff)
• WebInspectorUI/ChangeLog (modified) (1 diff)
• WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-12-17  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Remove "local" scope type from the protocol
+        https://bugs.webkit.org/show_bug.cgi?id=152409
+
+        Reviewed by Timothy Hatcher.
+
+        After r194251 the backend no longer sends this scope type.
+        So remove it from the protocol.
+
+        The concept of a Local Scope should be calculatable by the
+        frontend. In fact the way the backend used to do this could
+        easily be done by the frontend. To be done in a follow-up.
+
+        * inspector/InjectedScriptSource.js:
+        * inspector/JSJavaScriptCallFrame.h:
+        * inspector/protocol/Debugger.json:
+
 2015-12-17  Sukolsak Sakshuwong  <sukolsak@gmail.com>
 

trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js

@@ -1364 +1364 @@
 InjectedScript.CallFrameProxy._scopeTypeNames = {
     0: "global", // GLOBAL_SCOPE
-    1: "local", // LOCAL_SCOPE
-    2: "with", // WITH_SCOPE
-    3: "closure", // CLOSURE_SCOPE
-    4: "catch", // CATCH_SCOPE
-    5: "functionName", // FUNCTION_NAME_SCOPE
-    6: "globalLexicalEnvironment", // GLOBAL_LEXICAL_ENVIRONMENT_SCOPE
-    7: "nestedLexical", // NESTED_LEXICAL_SCOPE
+    1: "with", // WITH_SCOPE
+    2: "closure", // CLOSURE_SCOPE
+    3: "catch", // CATCH_SCOPE
+    4: "functionName", // FUNCTION_NAME_SCOPE
+    5: "globalLexicalEnvironment", // GLOBAL_LEXICAL_ENVIRONMENT_SCOPE
+    6: "nestedLexical", // NESTED_LEXICAL_SCOPE
 }
 

trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h

@@ -73 +73 @@
     // Constants.
     static const unsigned short GLOBAL_SCOPE = 0;
-    static const unsigned short LOCAL_SCOPE = 1;
-    static const unsigned short WITH_SCOPE = 2;
-    static const unsigned short CLOSURE_SCOPE = 3;
-    static const unsigned short CATCH_SCOPE = 4;
-    static const unsigned short FUNCTION_NAME_SCOPE = 5;
-    static const unsigned short GLOBAL_LEXICAL_ENVIRONMENT_SCOPE = 6;
-    static const unsigned short NESTED_LEXICAL_SCOPE = 7;
+    static const unsigned short WITH_SCOPE = 1;
+    static const unsigned short CLOSURE_SCOPE = 2;
+    static const unsigned short CATCH_SCOPE = 3;
+    static const unsigned short FUNCTION_NAME_SCOPE = 4;
+    static const unsigned short GLOBAL_LEXICAL_ENVIRONMENT_SCOPE = 5;
+    static const unsigned short NESTED_LEXICAL_SCOPE = 6;
 
 protected:

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

@@ -82 +82 @@
             "type": "object",
             "properties": [
-                { "name": "type", "type": "string", "enum": ["global", "local", "with", "closure", "catch", "functionName", "globalLexicalEnvironment", "nestedLexical"], "description": "Scope type." },
+                { "name": "type", "type": "string", "enum": ["global", "with", "closure", "catch", "functionName", "globalLexicalEnvironment", "nestedLexical"], "description": "Scope type." },
                 { "name": "object", "$ref": "Runtime.RemoteObject", "description": "Object representing the scope. For <code>global</code> and <code>with</code> scopes it represents the actual object; for the rest of the scopes, it is artificial transient object enumerating scope variables as its properties." }
             ],

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-12-17  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Remove "local" scope type from the protocol
+        https://bugs.webkit.org/show_bug.cgi?id=152409
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Controllers/DebuggerManager.js:
+        (WebInspector.DebuggerManager.prototype._scopeChainNodeFromPayload):
+
 2015-12-17  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -586 +586 @@
         var type = null;
         switch (payload.type) {
-        case DebuggerAgent.ScopeType.Local:
-            type = WebInspector.ScopeChainNode.Type.Local;
-            break;
         case DebuggerAgent.ScopeType.Global:
             type = WebInspector.ScopeChainNode.Type.Global;
@@ -610 +607 @@
             type = WebInspector.ScopeChainNode.Type.GlobalLexicalEnvironment;
             break;
+
+        // COMPATIBILITY (iOS 9): Debugger.ScopeType.Local used to be provided by the backend.
+        // Newer backends no longer send this enum value, it should be computed by the frontend.
+        case DebuggerAgent.ScopeType.Local:
+            type = WebInspector.ScopeChainNode.Type.Local;
+            break;
+
         default:
             console.error("Unknown type: " + payload.type);