<!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>[206105] 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/206105">206105</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-19 11:59:22 -0700 (Mon, 19 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Scope sidebar shows "Closure" instead of "Local" when paused in anonymous function
https://bugs.webkit.org/show_bug.cgi?id=162113
<rdar://problem/28348954>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-09-19
Reviewed by Brian Burg.
Source/WebInspectorUI:
* UserInterface/Models/CallFrame.js:
(WebInspector.CallFrame):
Default the functionName to the empty string. This will compare
favorably against other empty function names instead of null.
LayoutTests:
* inspector/debugger/paused-scopes-expected.txt:
* inspector/debugger/paused-scopes.html:
* inspector/debugger/resources/paused-scopes.js:
Add a third pause to test behavior paused inside an
unnamed anonymous function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerpausedscopesexpectedtxt">trunk/LayoutTests/inspector/debugger/paused-scopes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerpausedscopeshtml">trunk/LayoutTests/inspector/debugger/paused-scopes.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerresourcespausedscopesjs">trunk/LayoutTests/inspector/debugger/resources/paused-scopes.js</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCallFramejs">trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206104 => 206105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-19 18:46:07 UTC (rev 206104)
+++ trunk/LayoutTests/ChangeLog 2016-09-19 18:59:22 UTC (rev 206105)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-09-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Scope sidebar shows "Closure" instead of "Local" when paused in anonymous function
+ https://bugs.webkit.org/show_bug.cgi?id=162113
+ <rdar://problem/28348954>
+
+ Reviewed by Brian Burg.
+
+ * inspector/debugger/paused-scopes-expected.txt:
+ * inspector/debugger/paused-scopes.html:
+ * inspector/debugger/resources/paused-scopes.js:
+ Add a third pause to test behavior paused inside an
+ unnamed anonymous function.
+
</ins><span class="cx"> 2016-09-19 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Add accessibility support for details element on iOS
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerpausedscopesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/paused-scopes-expected.txt (206104 => 206105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/paused-scopes-expected.txt 2016-09-19 18:46:07 UTC (rev 206104)
+++ trunk/LayoutTests/inspector/debugger/paused-scopes-expected.txt 2016-09-19 18:59:22 UTC (rev 206105)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> == Running test suite: PausedCallFrameScope
</span><del>--- Running test case: TriggerFirstPause
</del><ins>+-- Running test case: PausedCallFrameScope.TriggerFirstPause
</ins><span class="cx"> CALLFRAME: firstPause
</span><span class="cx">
</span><span class="cx"> ---- Scope Chain ----
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> SCOPE: Name () - Type (Global) - Hash ()
</span><span class="cx">
</span><span class="cx">
</span><del>--- Running test case: TriggerSecondPause
</del><ins>+-- Running test case: PausedCallFrameScope.TriggerSecondPause
</ins><span class="cx"> CALLFRAME: secondPause
</span><span class="cx">
</span><span class="cx"> ---- Scope Chain ----
</span><span class="lines">@@ -160,6 +160,135 @@
</span><span class="cx"> ---- Scope Chain ----
</span><span class="cx"> SCOPE: Name (firstPause) - Type (Closure) - Hash (firstPause:<sourceID>:19:24)
</span><span class="cx"> - fakeFirstPauseLexicalVariable
</span><ins>+ SCOPE: Name (firstPause) - Type (Closure) - Hash (firstPause:<sourceID>:19:24)
+ SCOPE: Name (entry) - Type (Closure) - Hash (entry:<sourceID>:14:15)
+ - fooLexicalVariable2
+ SCOPE: Name (entry) - Type (Closure) - Hash (entry:<sourceID>:14:15)
+ - firstPause
+ - fooVarVariable1
+ SCOPE: Name () - Type (GlobalLexicalEnvironment) - Hash ()
+ - globalLet2
+ SCOPE: Name () - Type (Global) - Hash ()
+
+---- Merged Scope Chain ----
+ SCOPE: Name (firstPause) - Type (Local) - Hash (firstPause:<sourceID>:19:24)
+ - fakeFirstPauseLexicalVariable
+ SCOPE: Name (entry) - Type (Closure) - Hash (entry:<sourceID>:14:15)
+ - firstPause
+ - fooVarVariable1
+ - fooLexicalVariable2
+ SCOPE: Name () - Type (GlobalLexicalEnvironment) - Hash ()
+ - globalLet2
+ SCOPE: Name () - Type (Global) - Hash ()
+
+CALLFRAME: entry
+
+---- Scope Chain ----
+ SCOPE: Name (entry) - Type (Closure) - Hash (entry:<sourceID>:14:15)
+ - fooLexicalVariable2
+ SCOPE: Name (entry) - Type (Closure) - Hash (entry:<sourceID>:14:15)
+ - firstPause
+ - fooVarVariable1
+ SCOPE: Name () - Type (GlobalLexicalEnvironment) - Hash ()
+ - globalLet2
+ SCOPE: Name () - Type (Global) - Hash ()
+
+---- Merged Scope Chain ----
+ SCOPE: Name (entry) - Type (Local) - Hash (entry:<sourceID>:14:15)
+ - firstPause
+ - fooVarVariable1
+ - fooLexicalVariable2
+ SCOPE: Name () - Type (GlobalLexicalEnvironment) - Hash ()
+ - globalLet2
+ SCOPE: Name () - Type (Global) - Hash ()
+
+
+-- Running test case: PausedCallFrameScope.TriggerThirdPause
+CALLFRAME:
+
+---- Scope Chain ----
+ SCOPE: Name () - Type (Closure) - Hash (:<sourceID>:36:14)
+ - localVariableInsideAnonymousFunction
+ SCOPE: Name () - Type (Closure) - Hash (:<sourceID>:36:14)
+ SCOPE: Name (thirdPause) - Type (Closure) - Hash (thirdPause:<sourceID>:34:20)
+ - closureVariableInsideThirdPause
+ SCOPE: Name (thirdPause) - Type (Closure) - Hash (thirdPause:<sourceID>:34:20)
+ SCOPE: Name () - Type (GlobalLexicalEnvironment) - Hash ()
+ - globalLet2
+ SCOPE: Name () - Type (Global) - Hash ()
+
+---- Merged Scope Chain ----
+ SCOPE: Name () - Type (Local) - Hash (:<sourceID>:36:14)
+ - localVariableInsideAnonymousFunction
+ SCOPE: Name (thirdPause) - Type (Closure) - Hash (thirdPause:<sourceID>:34:20)
+ - closureVariableInsideThirdPause
+ SCOPE: Name () - Type (GlobalLexicalEnvironment) - Hash ()
+ - globalLet2
+ SCOPE: Name () - Type (Global) - Hash ()
+
+CALLFRAME: thirdPause
+
+---- Scope Chain ----
+ SCOPE: Name (thirdPause) - Type (Closure) - Hash (thirdPause:<sourceID>:34:20)
+ - closureVariableInsideThirdPause
+ SCOPE: Name (thirdPause) - Type (Closure) - Hash (thirdPause:<sourceID>:34:20)
+ SCOPE: Name () - Type (GlobalLexicalEnvironment) - Hash ()
+ - globalLet2
+ SCOPE: Name () - Type (Global) - Hash ()
+
+---- Merged Scope Chain ----
+ SCOPE: Name (thirdPause) - Type (Local) - Hash (thirdPause:<sourceID>:34:20)
+ - closureVariableInsideThirdPause
+ SCOPE: Name () - Type (GlobalLexicalEnvironment) - Hash ()
+ - globalLet2
+ SCOPE: Name () - Type (Global) - Hash ()
+
+CALLFRAME: firstPause
+
+---- Scope Chain ----
+ SCOPE: Name (firstPause) - Type (Block) - Hash (firstPause:<sourceID>:21:29)
+ - barLexicalVariable2
+ SCOPE: Name (firstPause) - Type (Closure) - Hash (firstPause:<sourceID>:21:29)
+ - barLexicalVariable2
+ SCOPE: Name (firstPause) - Type (Closure) - Hash (firstPause:<sourceID>:21:29)
+ - barVarVariable1
+ SCOPE: Name (firstPause) - Type (FunctionName) - Hash (firstPause:<sourceID>:21:29)
+ - firstPause
+ SCOPE: Name (firstPause) - Type (Closure) - Hash (firstPause:<sourceID>:19:24)
+ - fakeFirstPauseLexicalVariable
+ SCOPE: Name (firstPause) - Type (Closure) - Hash (firstPause:<sourceID>:19:24)
+ SCOPE: Name (entry) - Type (Closure) - Hash (entry:<sourceID>:14:15)
+ - fooLexicalVariable2
+ SCOPE: Name (entry) - Type (Closure) - Hash (entry:<sourceID>:14:15)
+ - firstPause
+ - fooVarVariable1
+ SCOPE: Name () - Type (GlobalLexicalEnvironment) - Hash ()
+ - globalLet2
+ SCOPE: Name () - Type (Global) - Hash ()
+
+---- Merged Scope Chain ----
+ SCOPE: Name (firstPause) - Type (Block) - Hash (firstPause:<sourceID>:21:29)
+ - barLexicalVariable2
+ SCOPE: Name (firstPause) - Type (Local) - Hash (firstPause:<sourceID>:21:29)
+ - barVarVariable1
+ - barLexicalVariable2
+ SCOPE: Name (firstPause) - Type (FunctionName) - Hash (firstPause:<sourceID>:21:29)
+ - firstPause
+ SCOPE: Name (firstPause) - Type (Closure) - Hash (firstPause:<sourceID>:19:24)
+ - fakeFirstPauseLexicalVariable
+ SCOPE: Name (entry) - Type (Closure) - Hash (entry:<sourceID>:14:15)
+ - firstPause
+ - fooVarVariable1
+ - fooLexicalVariable2
+ SCOPE: Name () - Type (GlobalLexicalEnvironment) - Hash ()
+ - globalLet2
+ SCOPE: Name () - Type (Global) - Hash ()
+
+CALLFRAME: firstPause
+
+---- Scope Chain ----
+ SCOPE: Name (firstPause) - Type (Closure) - Hash (firstPause:<sourceID>:19:24)
+ - fakeFirstPauseLexicalVariable
</ins><span class="cx"> SCOPE: Name (firstPause) - Type (Closure) - Hash (firstPause:<sourceID>:19:24)
</span><span class="cx"> SCOPE: Name (entry) - Type (Closure) - Hash (entry:<sourceID>:14:15)
</span><span class="cx"> - fooLexicalVariable2
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerpausedscopeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/paused-scopes.html (206104 => 206105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/paused-scopes.html 2016-09-19 18:46:07 UTC (rev 206104)
+++ trunk/LayoutTests/inspector/debugger/paused-scopes.html 2016-09-19 18:59:22 UTC (rev 206105)
</span><span class="lines">@@ -83,8 +83,8 @@
</span><span class="cx"> let suite = InspectorTest.createAsyncSuite("PausedCallFrameScope");
</span><span class="cx">
</span><span class="cx"> suite.addTestCase({
</span><del>- name: "TriggerFirstPause",
- description: "Verify CallFrames and Scopes with the first pause.",
</del><ins>+ name: "PausedCallFrameScope.TriggerFirstPause",
+ description: "Dump CallFrames and Scopes with the first pause.",
</ins><span class="cx"> test: (resolve, reject) => {
</span><span class="cx"> InspectorTest.evaluateInPage("setTimeout(entry)");
</span><span class="cx"> WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.CallFramesDidChange, (event) => {
</span><span class="lines">@@ -94,8 +94,8 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> suite.addTestCase({
</span><del>- name: "TriggerSecondPause",
- description: "Verify CallFrames and Scopes with the first pause.",
</del><ins>+ name: "PausedCallFrameScope.TriggerSecondPause",
+ description: "Dump CallFrames and Scopes with the second pause.",
</ins><span class="cx"> test: (resolve, reject) => {
</span><span class="cx"> WebInspector.debuggerManager.resume();
</span><span class="cx"> WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.CallFramesDidChange, (event) => {
</span><span class="lines">@@ -107,6 +107,20 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ suite.addTestCase({
+ name: "PausedCallFrameScope.TriggerThirdPause",
+ description: "Dump CallFrames and Scopes with the third pause.",
+ test: (resolve, reject) => {
+ WebInspector.debuggerManager.resume();
+ WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.CallFramesDidChange, (event) => {
+ dumpCallFrames().then(() => {
+ WebInspector.debuggerManager.resume();
+ resolve();
+ }, reject);
+ });
+ }
+ });
+
</ins><span class="cx"> suite.runTestCasesAndFinish();
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerresourcespausedscopesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/resources/paused-scopes.js (206104 => 206105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/resources/paused-scopes.js 2016-09-19 18:46:07 UTC (rev 206104)
+++ trunk/LayoutTests/inspector/debugger/resources/paused-scopes.js 2016-09-19 18:59:22 UTC (rev 206105)
</span><span class="lines">@@ -25,7 +25,16 @@
</span><span class="cx"> let barLexicalVariable2 = window.navigator; // NestedBlockScope (barLexicalVariable2)
</span><span class="cx"> debugger;
</span><span class="cx"> secondPause();
</span><ins>+ thirdPause();
</ins><span class="cx"> }
</span><span class="cx"> })();
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+function thirdPause() {
+ let closureVariableInsideThirdPause = false;
+ (function() {
+ let localVariableInsideAnonymousFunction = true;
+ debugger;
+ })();
+}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (206104 => 206105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-09-19 18:46:07 UTC (rev 206104)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-09-19 18:59:22 UTC (rev 206105)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-09-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Scope sidebar shows "Closure" instead of "Local" when paused in anonymous function
+ https://bugs.webkit.org/show_bug.cgi?id=162113
+ <rdar://problem/28348954>
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Models/CallFrame.js:
+ (WebInspector.CallFrame):
+ Default the functionName to the empty string. This will compare
+ favorably against other empty function names instead of null.
+
</ins><span class="cx"> 2016-09-19 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Make it easier to create a view from an existing DOM element
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCallFramejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js (206104 => 206105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js 2016-09-19 18:46:07 UTC (rev 206104)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js 2016-09-19 18:59:22 UTC (rev 206105)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> this._id = id || null;
</span><span class="cx"> this._sourceCodeLocation = sourceCodeLocation || null;
</span><del>- this._functionName = functionName || null;
</del><ins>+ this._functionName = functionName || "";
</ins><span class="cx"> this._thisObject = thisObject || null;
</span><span class="cx"> this._scopeChain = scopeChain || [];
</span><span class="cx"> this._nativeCode = nativeCode || false;
</span></span></pre>
</div>
</div>
</body>
</html>