<!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>[206698] 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/206698">206698</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-30 17:52:38 -0700 (Fri, 30 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Stepping to a line with an autoContinue breakpoint should still pause
https://bugs.webkit.org/show_bug.cgi?id=161712
<rdar://problem/28193970>
Reviewed by Brian Burg.
Source/JavaScriptCore:
* debugger/Debugger.cpp:
(JSC::Debugger::pauseIfNeeded):
If we stepped to an auto-continue breakpoint we should continue
stepping, not just continue.
LayoutTests:
* inspector/debugger/stepping/stepping-through-autoContinue-breakpoint-expected.txt: Added.
* inspector/debugger/stepping/stepping-through-autoContinue-breakpoint.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectordebuggersteppingsteppingthroughautoContinuebreakpointexpectedtxt">trunk/LayoutTests/inspector/debugger/stepping/stepping-through-autoContinue-breakpoint-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersteppingsteppingthroughautoContinuebreakpointhtml">trunk/LayoutTests/inspector/debugger/stepping/stepping-through-autoContinue-breakpoint.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206697 => 206698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-01 00:18:52 UTC (rev 206697)
+++ trunk/LayoutTests/ChangeLog 2016-10-01 00:52:38 UTC (rev 206698)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-09-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Stepping to a line with an autoContinue breakpoint should still pause
+ https://bugs.webkit.org/show_bug.cgi?id=161712
+ <rdar://problem/28193970>
+
+ Reviewed by Brian Burg.
+
+ * inspector/debugger/stepping/stepping-through-autoContinue-breakpoint-expected.txt: Added.
+ * inspector/debugger/stepping/stepping-through-autoContinue-breakpoint.html: Added.
+
+2016-09-30 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Stepping over/out of a function sometimes resumes instead of taking you to caller
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162802
</span><span class="cx"> <rdar://problem/28569982>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersteppingsteppingthroughautoContinuebreakpointexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/stepping/stepping-through-autoContinue-breakpoint-expected.txt (0 => 206698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/stepping/stepping-through-autoContinue-breakpoint-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/debugger/stepping/stepping-through-autoContinue-breakpoint-expected.txt 2016-10-01 00:52:38 UTC (rev 206698)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+ALERT: 1.5
+ALERT: 1
+ALERT: 2
+ALERT: 3
+Ensure stepping works through an autoContinue breakpoint.
+
+
+== Running test suite: Debugger.StepThroughAutoContinueBreakpoint
+-- Running test case: StepThroughAutoContinueBreakpoint
+PAUSED (debugger-statement)
+PAUSE AT entry:8:5
+ 4 <script src="../resources/log-pause-location.js"></script>
+ 5 <script>
+ 6 function entry() {
+ -> 7 |debugger;
+ 8 alert(1);
+ 9 alert(2); // Set an autoContinue breakpoint on this line.
+ 10 alert(3);
+
+PAUSE AT entry:9:5
+ 5 <script>
+ 6 function entry() {
+ 7 debugger;
+ -> 8 |alert(1);
+ 9 alert(2); // Set an autoContinue breakpoint on this line.
+ 10 alert(3);
+ 11 }
+
+PAUSE AT entry:10:5
+ 6 function entry() {
+ 7 debugger;
+ 8 alert(1);
+ -> 9 |alert(2); // Set an autoContinue breakpoint on this line.
+ 10 alert(3);
+ 11 }
+ 12
+
+PAUSE AT entry:11:5
+ 7 debugger;
+ 8 alert(1);
+ 9 alert(2); // Set an autoContinue breakpoint on this line.
+ -> 10 |alert(3);
+ 11 }
+ 12
+ 13 // ---------
+
+PAUSE AT entry:12:2
+ 8 alert(1);
+ 9 alert(2); // Set an autoContinue breakpoint on this line.
+ 10 alert(3);
+ -> 11 }|
+ 12
+ 13 // ---------
+ 14
+
+RESUMED
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersteppingsteppingthroughautoContinuebreakpointhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/stepping/stepping-through-autoContinue-breakpoint.html (0 => 206698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/stepping/stepping-through-autoContinue-breakpoint.html (rev 0)
+++ trunk/LayoutTests/inspector/debugger/stepping/stepping-through-autoContinue-breakpoint.html 2016-10-01 00:52:38 UTC (rev 206698)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../http/tests/inspector/resources/inspector-test.js"></script>
+<script src="../resources/log-pause-location.js"></script>
+<script>
+function entry() {
+ debugger;
+ alert(1);
+ alert(2); // Set an autoContinue breakpoint on this line.
+ alert(3);
+}
+
+// ---------
+
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("Debugger.StepThroughAutoContinueBreakpoint");
+
+ suite.addTestCase({
+ name: "StepThroughAutoContinueBreakpoint",
+ description: "Stepping through statements should still work after encountering an autoContinue breakpoint.",
+ test(resolve, reject) {
+ // Set autoContinue breakpoint.
+ let script = WebInspector.frameResourceManager.mainFrame.mainResource.scripts[0];
+ var location = script.createSourceCodeLocation(8, 0);
+ var breakpoint = new WebInspector.Breakpoint(location);
+ breakpoint.autoContinue = true;
+ breakpoint.createAction(WebInspector.BreakpointAction.Type.Evaluate, null, "alert(1.5);");
+ WebInspector.debuggerManager.addBreakpoint(breakpoint);
+
+ // Step through the breakpoint.
+ InspectorTest.evaluateInPage("setTimeout(entry)");
+ WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Paused, (event) => {
+ InspectorTest.log(`PAUSED (${WebInspector.debuggerManager.pauseReason})`);
+ });
+ WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.CallFramesDidChange, (event) => {
+ if (!WebInspector.debuggerManager.activeCallFrame)
+ return;
+ logPauseLocation();
+ WebInspector.debuggerManager.stepInto();
+ });
+ WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Resumed, (event) => {
+ InspectorTest.log("RESUMED");
+ resolve();
+ });
+ }
+ });
+
+ loadMainPageContent().then(() => {
+ suite.runTestCasesAndFinish();
+ });
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Ensure stepping works through an autoContinue breakpoint.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206697 => 206698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-01 00:18:52 UTC (rev 206697)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-01 00:52:38 UTC (rev 206698)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-09-30 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Stepping to a line with an autoContinue breakpoint should still pause
+ https://bugs.webkit.org/show_bug.cgi?id=161712
+ <rdar://problem/28193970>
+
+ Reviewed by Brian Burg.
+
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::pauseIfNeeded):
+ If we stepped to an auto-continue breakpoint we should continue
+ stepping, not just continue.
+
</ins><span class="cx"> 2016-09-30 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> B3 should support trapping memory accesses
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (206697 => 206698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2016-10-01 00:18:52 UTC (rev 206697)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2016-10-01 00:52:38 UTC (rev 206698)
</span><span class="lines">@@ -691,13 +691,15 @@
</span><span class="cx"> if (m_suppressAllPauses)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Breakpoint breakpoint;
- bool didHitBreakpoint = false;
</del><ins>+ DebuggerPausedScope debuggerPausedScope(*this);
+
</ins><span class="cx"> bool pauseNow = m_pauseAtNextOpportunity;
</span><span class="cx"> pauseNow |= (m_pauseOnCallFrame == m_currentCallFrame);
</span><span class="cx">
</span><del>- DebuggerPausedScope debuggerPausedScope(*this);
</del><ins>+ bool didPauseForStep = pauseNow;
+ bool didHitBreakpoint = false;
</ins><span class="cx">
</span><ins>+ Breakpoint breakpoint;
</ins><span class="cx"> intptr_t sourceID = DebuggerCallFrame::sourceIDForCallFrame(m_currentCallFrame);
</span><span class="cx"> TextPosition position = DebuggerCallFrame::positionForCallFrame(m_currentCallFrame);
</span><span class="cx"> pauseNow |= didHitBreakpoint = hasBreakpoint(sourceID, position, &breakpoint);
</span><span class="lines">@@ -717,9 +719,15 @@
</span><span class="cx"> handleBreakpointHit(vmEntryGlobalObject, breakpoint);
</span><span class="cx"> // Note that the actions can potentially stop the debugger, so we need to check that
</span><span class="cx"> // we still have a current call frame when we get back.
</span><del>- if (breakpoint.autoContinue || !m_currentCallFrame)
</del><ins>+ if (!m_currentCallFrame)
</ins><span class="cx"> return;
</span><del>- m_pausingBreakpointID = breakpoint.id;
</del><ins>+
+ if (breakpoint.autoContinue) {
+ if (!didPauseForStep)
+ return;
+ didHitBreakpoint = false;
+ } else
+ m_pausingBreakpointID = breakpoint.id;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>