<!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>[208755] 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/208755">208755</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-15 14:12:50 -0800 (Tue, 15 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: inspector/worker/debugger-pause.html fails on WebKit1
https://bugs.webkit.org/show_bug.cgi?id=164787
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-11-15
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::InspectorDebuggerAgent::cancelPauseOnNextStatement):
Clear this DebuggerAgent state when we resume.
LayoutTests:
* inspector/worker/debugger-pause.html:
Make this test work for WebKit1 where the VM is shared between the
page and inspector page. We need to be able to stop the Inspector's
evaluation, so that we can evaluate and pause on the page, and then
come back to the inspector afterwards.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorworkerdebuggerpausehtml">trunk/LayoutTests/inspector/worker/debugger-pause.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208754 => 208755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-15 22:02:01 UTC (rev 208754)
+++ trunk/LayoutTests/ChangeLog 2016-11-15 22:12:50 UTC (rev 208755)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-15 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: inspector/worker/debugger-pause.html fails on WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=164787
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/worker/debugger-pause.html:
+ Make this test work for WebKit1 where the VM is shared between the
+ page and inspector page. We need to be able to stop the Inspector's
+ evaluation, so that we can evaluate and pause on the page, and then
+ come back to the inspector afterwards.
+
</ins><span class="cx"> 2016-11-15 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Implement support for visual viewports
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorworkerdebuggerpausehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/worker/debugger-pause.html (208754 => 208755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/worker/debugger-pause.html 2016-11-15 22:02:01 UTC (rev 208754)
+++ trunk/LayoutTests/inspector/worker/debugger-pause.html 2016-11-15 22:12:50 UTC (rev 208755)
</span><span class="lines">@@ -19,6 +19,21 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // In each test, the Worker pauses and the Main Thread is waiting to
+ // pause on the next statement. Do an InspectorTest.log, which evalutes
+ // JavaScript in the page and should pause. Then later run work.
+ // In WebKit1, because the VM is shared between the inspector and
+ // inspected page we need to put an artificial break between our
+ // Inspector JavaScript, the Page JavaScript, and back to the Inspector.
+ function pauseTheMainThread() {
+ return new Promise((resolve, reject) => {
+ setTimeout(() => {
+ InspectorTest.log("");
+ setTimeout(resolve);
+ });
+ });
+ }
+
</ins><span class="cx"> WebInspector.debuggerManager.allUncaughtExceptionsBreakpoint.disabled = false;
</span><span class="cx"> WebInspector.debuggerManager.assertionsBreakpoint.disabled = false;
</span><span class="cx">
</span><span class="lines">@@ -31,12 +46,13 @@
</span><span class="cx"> test(resolve, reject) {
</span><span class="cx"> InspectorTest.evaluateInPage(`worker.postMessage("triggerDebuggerStatement")`);
</span><span class="cx"> WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Paused, (event) => {
</span><del>- InspectorTest.log(""); // This evaluation will pause the MainThread.
- InspectorTest.pass("Paused");
- InspectorTest.expectEqual(WebInspector.debuggerManager.activeCallFrame.target, workerTarget, "Should be paused in a Worker CallFrame.");
- InspectorTest.expectEqual(workerDebuggerData.pauseReason, WebInspector.DebuggerManager.PauseReason.DebuggerStatement, "Pause reason should be a debugger statement.");
- logPauseLocation();
- WebInspector.debuggerManager.resume().then(resolve, reject);
</del><ins>+ pauseTheMainThread().then(() => {
+ InspectorTest.pass("Paused");
+ InspectorTest.expectEqual(WebInspector.debuggerManager.activeCallFrame.target, workerTarget, "Should be paused in a Worker CallFrame.");
+ InspectorTest.expectEqual(workerDebuggerData.pauseReason, WebInspector.DebuggerManager.PauseReason.DebuggerStatement, "Pause reason should be a debugger statement.");
+ logPauseLocation();
+ WebInspector.debuggerManager.resume().then(resolve, reject);
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -50,12 +66,13 @@
</span><span class="cx"> WebInspector.debuggerManager.addBreakpoint(breakpoint);
</span><span class="cx"> InspectorTest.evaluateInPage(`worker.postMessage("triggerBreakpoint")`);
</span><span class="cx"> WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Paused, (event) => {
</span><del>- InspectorTest.log(""); // This evaluation will pause the MainThread.
- InspectorTest.pass("Paused");
- InspectorTest.expectEqual(WebInspector.debuggerManager.activeCallFrame.target, workerTarget, "Should be paused in a Worker CallFrame.");
- InspectorTest.expectEqual(workerDebuggerData.pauseReason, WebInspector.DebuggerManager.PauseReason.Breakpoint, "Pause reason should be a breakpoint.");
- logPauseLocation();
- WebInspector.debuggerManager.resume().then(resolve, reject);
</del><ins>+ pauseTheMainThread().then(() => {
+ InspectorTest.pass("Paused");
+ InspectorTest.expectEqual(WebInspector.debuggerManager.activeCallFrame.target, workerTarget, "Should be paused in a Worker CallFrame.");
+ InspectorTest.expectEqual(workerDebuggerData.pauseReason, WebInspector.DebuggerManager.PauseReason.Breakpoint, "Pause reason should be a breakpoint.");
+ logPauseLocation();
+ WebInspector.debuggerManager.resume().then(resolve, reject);
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -66,12 +83,13 @@
</span><span class="cx"> test(resolve, reject) {
</span><span class="cx"> InspectorTest.evaluateInPage(`worker.postMessage("triggerException")`);
</span><span class="cx"> WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Paused, (event) => {
</span><del>- InspectorTest.log(""); // This evaluation will pause the MainThread.
- InspectorTest.pass("Paused");
- InspectorTest.expectEqual(WebInspector.debuggerManager.activeCallFrame.target, workerTarget, "Should be paused in a Worker CallFrame.");
- InspectorTest.expectEqual(workerDebuggerData.pauseReason, WebInspector.DebuggerManager.PauseReason.Exception, "Pause reason should be an exception.");
- logPauseLocation();
- WebInspector.debuggerManager.resume().then(resolve, reject);
</del><ins>+ pauseTheMainThread().then(() => {
+ InspectorTest.pass("Paused");
+ InspectorTest.expectEqual(WebInspector.debuggerManager.activeCallFrame.target, workerTarget, "Should be paused in a Worker CallFrame.");
+ InspectorTest.expectEqual(workerDebuggerData.pauseReason, WebInspector.DebuggerManager.PauseReason.Exception, "Pause reason should be an exception.");
+ logPauseLocation();
+ WebInspector.debuggerManager.resume().then(resolve, reject);
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -82,12 +100,13 @@
</span><span class="cx"> test(resolve, reject) {
</span><span class="cx"> InspectorTest.evaluateInPage(`worker.postMessage("triggerAssertion")`);
</span><span class="cx"> WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Paused, (event) => {
</span><del>- InspectorTest.log(""); // This evaluation will pause the MainThread.
- InspectorTest.pass("Paused");
- InspectorTest.expectEqual(WebInspector.debuggerManager.activeCallFrame.target, workerTarget, "Should be paused in a Worker CallFrame.");
- InspectorTest.expectEqual(workerDebuggerData.pauseReason, WebInspector.DebuggerManager.PauseReason.Assertion, "Pause reason should be an exception.");
- logPauseLocation();
- WebInspector.debuggerManager.resume().then(resolve, reject);
</del><ins>+ pauseTheMainThread().then(() => {
+ InspectorTest.pass("Paused");
+ InspectorTest.expectEqual(WebInspector.debuggerManager.activeCallFrame.target, workerTarget, "Should be paused in a Worker CallFrame.");
+ InspectorTest.expectEqual(workerDebuggerData.pauseReason, WebInspector.DebuggerManager.PauseReason.Assertion, "Pause reason should be an exception.");
+ logPauseLocation();
+ WebInspector.debuggerManager.resume().then(resolve, reject);
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208754 => 208755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-15 22:02:01 UTC (rev 208754)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-15 22:12:50 UTC (rev 208755)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-15 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: inspector/worker/debugger-pause.html fails on WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=164787
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::cancelPauseOnNextStatement):
+ Clear this DebuggerAgent state when we resume.
+
</ins><span class="cx"> 2016-11-15 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> It should be possible to disable concurrent GC timeslicing
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (208754 => 208755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2016-11-15 22:02:01 UTC (rev 208754)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2016-11-15 22:12:50 UTC (rev 208755)
</span><span class="lines">@@ -598,6 +598,8 @@
</span><span class="cx"> if (!m_javaScriptPauseScheduled)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ m_javaScriptPauseScheduled = false;
+
</ins><span class="cx"> clearBreakDetails();
</span><span class="cx"> m_scriptDebugServer.setPauseOnNextStatement(false);
</span><span class="cx"> m_enablePauseWhenIdle = false;
</span></span></pre>
</div>
</div>
</body>
</html>