Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (194258 => 194259)
--- trunk/Source/_javascript_Core/ChangeLog 2015-12-18 04:14:40 UTC (rev 194258)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-12-18 04:18:01 UTC (rev 194259)
@@ -1,3 +1,21 @@
+2015-12-17 Joseph Pecoraro <[email protected]>
+
+ 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 <[email protected]>
[INTL] Implement Collator Compare Functions
Modified: trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js (194258 => 194259)
--- trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js 2015-12-18 04:14:40 UTC (rev 194258)
+++ trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js 2015-12-18 04:18:01 UTC (rev 194259)
@@ -1363,13 +1363,12 @@
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
}
InjectedScript.CallFrameProxy._createScopeJson = function(scopeTypeCode, scopeObject, groupId)
Modified: trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFrame.h (194258 => 194259)
--- trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFrame.h 2015-12-18 04:14:40 UTC (rev 194258)
+++ trunk/Source/_javascript_Core/inspector/JSJavaScriptCallFrame.h 2015-12-18 04:18:01 UTC (rev 194259)
@@ -72,13 +72,12 @@
// 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:
void finishCreation(JSC::VM&);
Modified: trunk/Source/_javascript_Core/inspector/protocol/Debugger.json (194258 => 194259)
--- trunk/Source/_javascript_Core/inspector/protocol/Debugger.json 2015-12-18 04:14:40 UTC (rev 194258)
+++ trunk/Source/_javascript_Core/inspector/protocol/Debugger.json 2015-12-18 04:18:01 UTC (rev 194259)
@@ -81,7 +81,7 @@
"id": "Scope",
"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." }
],
"description": "Scope description."
Modified: trunk/Source/WebInspectorUI/ChangeLog (194258 => 194259)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-12-18 04:14:40 UTC (rev 194258)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-12-18 04:18:01 UTC (rev 194259)
@@ -1,5 +1,15 @@
2015-12-17 Joseph Pecoraro <[email protected]>
+ 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 <[email protected]>
+
Web Inspector: CSS warning's fake CallFrame is not creating a valid payload
https://bugs.webkit.org/show_bug.cgi?id=152413
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (194258 => 194259)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-12-18 04:14:40 UTC (rev 194258)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-12-18 04:18:01 UTC (rev 194259)
@@ -585,9 +585,6 @@
{
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;
break;
@@ -609,6 +606,13 @@
case DebuggerAgent.ScopeType.GlobalLexicalEnvironment:
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);
}
