<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193425] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193425">193425</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-04 10:49:47 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Specifically Identify the Global Lexical Environment Scope
https://bugs.webkit.org/show_bug.cgi?id=151828
Reviewed by Brian Burg.
Source/JavaScriptCore:
* inspector/InjectedScriptSource.js:
Include the new scope type.
* inspector/JSJavaScriptCallFrame.h:
* inspector/JSJavaScriptCallFrame.cpp:
(Inspector::JSJavaScriptCallFrame::scopeType):
Set the new value for the new scope type.
* inspector/JSJavaScriptCallFramePrototype.cpp:
(Inspector::JSJavaScriptCallFramePrototype::finishCreation): Deleted.
(Inspector::jsJavaScriptCallFrameConstantGLOBAL_SCOPE): Deleted.
(Inspector::jsJavaScriptCallFrameConstantLOCAL_SCOPE): Deleted.
(Inspector::jsJavaScriptCallFrameConstantWITH_SCOPE): Deleted.
(Inspector::jsJavaScriptCallFrameConstantCLOSURE_SCOPE): Deleted.
(Inspector::jsJavaScriptCallFrameConstantCATCH_SCOPE): Deleted.
(Inspector::jsJavaScriptCallFrameConstantFUNCTION_NAME_SCOPE): Deleted.
Remove unused constants on the JavaScriptCallFrame object.
Currently they are just hardcoded in InjectedScriptSource
and they don't make sense on instances anyways.
Source/WebInspectorUI:
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Controllers/DebuggerManager.js:
(WebInspector.DebuggerManager.prototype._scopeChainNodeFromPayload):
* UserInterface/Models/ScopeChainNode.js:
* UserInterface/Views/ScopeChainDetailsSidebarPanel.js:
(WebInspector.ScopeChainDetailsSidebarPanel.prototype._generateCallFramesSection):
Include a new scope type and give it a localized string.
LayoutTests:
* inspector/debugger/breakpoint-scope-expected.txt:
* inspector/debugger/breakpoint-scope.html:
* inspector/debugger/resources/scope.js:
Update the test to include something in the global lexical
environment and ensure it is identified as such.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointscopeexpectedtxt">trunk/LayoutTests/inspector/debugger/breakpoint-scope-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointscopehtml">trunk/LayoutTests/inspector/debugger/breakpoint-scope.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerresourcesscopejs">trunk/LayoutTests/inspector/debugger/resources/scope.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs">trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramecpp">trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFrameh">trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramePrototypecpp">trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolDebuggerjson">trunk/Source/JavaScriptCore/inspector/protocol/Debugger.json</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsScopeChainNodejs">trunk/Source/WebInspectorUI/UserInterface/Models/ScopeChainNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/LayoutTests/ChangeLog 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-12-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Specifically Identify the Global Lexical Environment Scope
+ https://bugs.webkit.org/show_bug.cgi?id=151828
+
+ Reviewed by Brian Burg.
+
+ * inspector/debugger/breakpoint-scope-expected.txt:
+ * inspector/debugger/breakpoint-scope.html:
+ * inspector/debugger/resources/scope.js:
+ Update the test to include something in the global lexical
+ environment and ensure it is identified as such.
+
</ins><span class="cx"> 2015-12-03 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Fix height computation of grid items with borders inside fr tracks
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointscopeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/breakpoint-scope-expected.txt (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoint-scope-expected.txt 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-scope-expected.txt 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -1,13 +1,15 @@
</span><del>-CONSOLE MESSAGE: line 1: Paused at line: 2, column: 8
</del><ins>+CONSOLE MESSAGE: line 1: Paused at line: 4, column: 8
</ins><span class="cx"> Testing that we can access scope in various functions.
</span><span class="cx">
</span><span class="cx"> Starting Test
</span><del>-Hit breakpoint at line: 2, column: 8
</del><ins>+Hit breakpoint at line: 4, column: 8
</ins><span class="cx"> scope-chain-type-local properties:
</span><span class="cx"> resolve
</span><span class="cx"> reject
</span><span class="cx"> scope-chain-type-closure properties:
</span><span class="cx"> p
</span><ins>+scope-chain-type-globalLexicalEnvironment properties:
+ lexicalVariable
</ins><span class="cx"> scope-chain-type-global (properties not listed)
</span><span class="cx"> Tests done
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointscopehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/breakpoint-scope.html (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoint-scope.html 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-scope.html 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><span class="cx"> var testInfoList = [
</span><del>- { line : 2, column : 8, startFunc : "testNativeScope()" }
</del><ins>+ { line : 4, column : 8, startFunc : "testNativeScope()" }
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> var currentTestIndex = 0;
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerresourcesscopejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/resources/scope.js (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/resources/scope.js 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/LayoutTests/inspector/debugger/resources/scope.js 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -1,3 +1,5 @@
</span><ins>+let lexicalVariable = true;
+
</ins><span class="cx"> function testNativeScope() {
</span><span class="cx"> var p = new Promise(function(resolve, reject) {
</span><span class="cx"> debugger;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-12-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Specifically Identify the Global Lexical Environment Scope
+ https://bugs.webkit.org/show_bug.cgi?id=151828
+
+ Reviewed by Brian Burg.
+
+ * inspector/InjectedScriptSource.js:
+ Include the new scope type.
+
+ * inspector/JSJavaScriptCallFrame.h:
+ * inspector/JSJavaScriptCallFrame.cpp:
+ (Inspector::JSJavaScriptCallFrame::scopeType):
+ Set the new value for the new scope type.
+
+ * inspector/JSJavaScriptCallFramePrototype.cpp:
+ (Inspector::JSJavaScriptCallFramePrototype::finishCreation): Deleted.
+ (Inspector::jsJavaScriptCallFrameConstantGLOBAL_SCOPE): Deleted.
+ (Inspector::jsJavaScriptCallFrameConstantLOCAL_SCOPE): Deleted.
+ (Inspector::jsJavaScriptCallFrameConstantWITH_SCOPE): Deleted.
+ (Inspector::jsJavaScriptCallFrameConstantCLOSURE_SCOPE): Deleted.
+ (Inspector::jsJavaScriptCallFrameConstantCATCH_SCOPE): Deleted.
+ (Inspector::jsJavaScriptCallFrameConstantFUNCTION_NAME_SCOPE): Deleted.
+ Remove unused constants on the JavaScriptCallFrame object.
+ Currently they are just hardcoded in InjectedScriptSource
+ and they don't make sense on instances anyways.
+
</ins><span class="cx"> 2015-12-04 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Add an option to emit instructions validating exceptions in the DFG rather than always emiting them.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -1368,6 +1368,7 @@
</span><span class="cx"> 3: "closure", // CLOSURE_SCOPE
</span><span class="cx"> 4: "catch", // CATCH_SCOPE
</span><span class="cx"> 5: "functionName", // FUNCTION_NAME_SCOPE
</span><ins>+ 6: "globalLexicalEnvironment", // GLOBAL_LEXICAL_ENVIRONMENT_SCOPE
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InjectedScript.CallFrameProxy._createScopeJson = function(scopeTypeCode, scopeObject, groupId)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -113,11 +113,8 @@
</span><span class="cx"> return jsNumber(JSJavaScriptCallFrame::FUNCTION_NAME_SCOPE);
</span><span class="cx"> if (scope->isWithScope())
</span><span class="cx"> return jsNumber(JSJavaScriptCallFrame::WITH_SCOPE);
</span><del>- if (scope->isGlobalLexicalEnvironment()) {
- // FIXME: We need a way to better describe this scope.
- // It's currently best described as a "closure" scope.
- return jsNumber(JSJavaScriptCallFrame::CLOSURE_SCOPE);
- }
</del><ins>+ if (scope->isGlobalLexicalEnvironment())
+ return jsNumber(JSJavaScriptCallFrame::GLOBAL_LEXICAL_ENVIRONMENT_SCOPE);
</ins><span class="cx"> if (scope->isGlobalScope()) {
</span><span class="cx"> ASSERT(++iter == end);
</span><span class="cx"> return jsNumber(JSJavaScriptCallFrame::GLOBAL_SCOPE);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> static const unsigned short CLOSURE_SCOPE = 3;
</span><span class="cx"> static const unsigned short CATCH_SCOPE = 4;
</span><span class="cx"> static const unsigned short FUNCTION_NAME_SCOPE = 5;
</span><ins>+ static const unsigned short GLOBAL_LEXICAL_ENVIRONMENT_SCOPE = 6;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void finishCreation(JSC::VM&);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramePrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.cpp (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.cpp 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.cpp 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -51,14 +51,6 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameAttributeThisObject(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameAttributeType(ExecState*);
</span><span class="cx">
</span><del>-// Constants.
-static EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameConstantGLOBAL_SCOPE(ExecState*);
-static EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameConstantLOCAL_SCOPE(ExecState*);
-static EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameConstantWITH_SCOPE(ExecState*);
-static EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameConstantCLOSURE_SCOPE(ExecState*);
-static EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameConstantCATCH_SCOPE(ExecState*);
-static EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameConstantFUNCTION_NAME_SCOPE(ExecState*);
-
</del><span class="cx"> const ClassInfo JSJavaScriptCallFramePrototype::s_info = { "JavaScriptCallFrame", &Base::s_info, 0, CREATE_METHOD_TABLE(JSJavaScriptCallFramePrototype) };
</span><span class="cx">
</span><span class="cx"> #define JSC_NATIVE_NON_INDEX_ACCESSOR(jsName, cppName, attributes) \
</span><span class="lines">@@ -87,13 +79,6 @@
</span><span class="cx"> JSC_NATIVE_NON_INDEX_ACCESSOR("scopeChain", jsJavaScriptCallFrameAttributeScopeChain, DontEnum | Accessor);
</span><span class="cx"> JSC_NATIVE_NON_INDEX_ACCESSOR("thisObject", jsJavaScriptCallFrameAttributeThisObject, DontEnum | Accessor);
</span><span class="cx"> JSC_NATIVE_NON_INDEX_ACCESSOR("type", jsJavaScriptCallFrameAttributeType, DontEnum | Accessor);
</span><del>-
- JSC_NATIVE_NON_INDEX_ACCESSOR("GLOBAL_SCOPE", jsJavaScriptCallFrameConstantGLOBAL_SCOPE, DontEnum | Accessor);
- JSC_NATIVE_NON_INDEX_ACCESSOR("LOCAL_SCOPE", jsJavaScriptCallFrameConstantLOCAL_SCOPE, DontEnum | Accessor);
- JSC_NATIVE_NON_INDEX_ACCESSOR("WITH_SCOPE", jsJavaScriptCallFrameConstantWITH_SCOPE, DontEnum | Accessor);
- JSC_NATIVE_NON_INDEX_ACCESSOR("CLOSURE_SCOPE", jsJavaScriptCallFrameConstantCLOSURE_SCOPE, DontEnum | Accessor);
- JSC_NATIVE_NON_INDEX_ACCESSOR("CATCH_SCOPE", jsJavaScriptCallFrameConstantCATCH_SCOPE, DontEnum | Accessor);
- JSC_NATIVE_NON_INDEX_ACCESSOR("FUNCTION_NAME_SCOPE", jsJavaScriptCallFrameConstantFUNCTION_NAME_SCOPE, DontEnum | Accessor);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFramePrototypeFunctionEvaluate(ExecState* exec)
</span><span class="lines">@@ -206,34 +191,4 @@
</span><span class="cx"> return JSValue::encode(castedThis->type(exec));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameConstantGLOBAL_SCOPE(ExecState*)
-{
- return JSValue::encode(jsNumber(JSJavaScriptCallFrame::GLOBAL_SCOPE));
-}
-
-EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameConstantLOCAL_SCOPE(ExecState*)
-{
- return JSValue::encode(jsNumber(JSJavaScriptCallFrame::LOCAL_SCOPE));
-}
-
-EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameConstantWITH_SCOPE(ExecState*)
-{
- return JSValue::encode(jsNumber(JSJavaScriptCallFrame::WITH_SCOPE));
-}
-
-EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameConstantCLOSURE_SCOPE(ExecState*)
-{
- return JSValue::encode(jsNumber(JSJavaScriptCallFrame::CLOSURE_SCOPE));
-}
-
-EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameConstantCATCH_SCOPE(ExecState*)
-{
- return JSValue::encode(jsNumber(JSJavaScriptCallFrame::CATCH_SCOPE));
-}
-
-EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameConstantFUNCTION_NAME_SCOPE(ExecState*)
-{
- return JSValue::encode(jsNumber(JSJavaScriptCallFrame::FUNCTION_NAME_SCOPE));
-}
-
</del><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolDebuggerjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Debugger.json (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Debugger.json 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Debugger.json 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> "id": "Scope",
</span><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><del>- { "name": "type", "type": "string", "enum": ["global", "local", "with", "closure", "catch", "functionName"], "description": "Scope type." },
</del><ins>+ { "name": "type", "type": "string", "enum": ["global", "local", "with", "closure", "catch", "functionName", "globalLexicalEnvironment"], "description": "Scope type." },
</ins><span class="cx"> { "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." }
</span><span class="cx"> ],
</span><span class="cx"> "description": "Scope description."
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-12-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Specifically Identify the Global Lexical Environment Scope
+ https://bugs.webkit.org/show_bug.cgi?id=151828
+
+ Reviewed by Brian Burg.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Controllers/DebuggerManager.js:
+ (WebInspector.DebuggerManager.prototype._scopeChainNodeFromPayload):
+ * UserInterface/Models/ScopeChainNode.js:
+ * UserInterface/Views/ScopeChainDetailsSidebarPanel.js:
+ (WebInspector.ScopeChainDetailsSidebarPanel.prototype._generateCallFramesSection):
+ Include a new scope type and give it a localized string.
+
</ins><span class="cx"> 2015-12-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Objective-C GC support
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -309,6 +309,7 @@
</span><span class="cx"> localizedStrings["Garbage Collection"] = "Garbage Collection";
</span><span class="cx"> localizedStrings["Getter"] = "Getter";
</span><span class="cx"> localizedStrings["Global Breakpoints"] = "Global Breakpoints";
</span><ins>+localizedStrings["Global Lexical Environment"] = "Global Lexical Environment";
</ins><span class="cx"> localizedStrings["Global Variables"] = "Global Variables";
</span><span class="cx"> localizedStrings["Grammar"] = "Grammar";
</span><span class="cx"> localizedStrings["Group"] = "Group";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -603,6 +603,9 @@
</span><span class="cx"> case "functionName":
</span><span class="cx"> type = WebInspector.ScopeChainNode.Type.FunctionName;
</span><span class="cx"> break;
</span><ins>+ case "globalLexicalEnvironment":
+ type = WebInspector.ScopeChainNode.Type.GlobalLexicalEnvironment;
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> console.error("Unknown type: " + payload.type);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsScopeChainNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ScopeChainNode.js (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ScopeChainNode.js 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ScopeChainNode.js 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -58,5 +58,6 @@
</span><span class="cx"> With: "scope-chain-type-with",
</span><span class="cx"> Closure: "scope-chain-type-closure",
</span><span class="cx"> Catch: "scope-chain-type-catch",
</span><del>- FunctionName: "scope-chain-type-functionName"
</del><ins>+ FunctionName: "scope-chain-type-functionName",
+ GlobalLexicalEnvironment: "scope-chain-type-globalLexicalEnvironment",
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js (193424 => 193425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2015-12-04 18:45:43 UTC (rev 193424)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2015-12-04 18:49:47 UTC (rev 193425)
</span><span class="lines">@@ -208,6 +208,11 @@
</span><span class="cx"> title = WebInspector.UIString("Global Variables");
</span><span class="cx"> collapsedByDefault = true;
</span><span class="cx"> break;
</span><ins>+
+ case WebInspector.ScopeChainNode.Type.GlobalLexicalEnvironment:
+ title = WebInspector.UIString("Global Lexical Environment");
+ collapsedByDefault = true;
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> let detailsSectionIdentifier = scope.type + "-" + sectionCountByType.get(scope.type);
</span></span></pre>
</div>
</div>
</body>
</html>