<!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>[209557] 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/209557">209557</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-08 12:23:41 -0800 (Thu, 08 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Unable to delete breakpoint from worker script
https://bugs.webkit.org/show_bug.cgi?id=165578
Reviewed by Matt Baker.
Source/WebInspectorUI:
* UserInterface/Controllers/DebuggerManager.js:
(WebInspector.DebuggerManager.prototype._removeBreakpoint):
Match setting breakpoints. If this is a "URL breakpoint", affect
all targets. If this is a "Script breakpoint", affect just the
single target containing that Script.
LayoutTests:
* inspector/worker/debugger-shared-breakpoint-expected.txt: Added.
* inspector/worker/debugger-shared-breakpoint.html: Added.
Ensure setting / removing a breakpoint affects all Workers that share
a resource with the same URL.
* inspector/worker/resources/worker-debugger-pause.js:
Add an echo command that will be useful to ensure Workers are not paused.</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="#trunkLayoutTestsinspectorworkerresourcesworkerdebuggerpausejs">trunk/LayoutTests/inspector/worker/resources/worker-debugger-pause.js</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorworkerdebuggersharedbreakpointexpectedtxt">trunk/LayoutTests/inspector/worker/debugger-shared-breakpoint-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorworkerdebuggersharedbreakpointhtml">trunk/LayoutTests/inspector/worker/debugger-shared-breakpoint.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209556 => 209557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-08 20:14:26 UTC (rev 209556)
+++ trunk/LayoutTests/ChangeLog 2016-12-08 20:23:41 UTC (rev 209557)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-12-08 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Unable to delete breakpoint from worker script
+ https://bugs.webkit.org/show_bug.cgi?id=165578
+
+ Reviewed by Matt Baker.
+
+ * inspector/worker/debugger-shared-breakpoint-expected.txt: Added.
+ * inspector/worker/debugger-shared-breakpoint.html: Added.
+ Ensure setting / removing a breakpoint affects all Workers that share
+ a resource with the same URL.
+
+ * inspector/worker/resources/worker-debugger-pause.js:
+ Add an echo command that will be useful to ensure Workers are not paused.
+
</ins><span class="cx"> 2016-12-08 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline fast/selectors/nth-last-child-bounds.html after r209548.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorworkerdebuggerpausehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/worker/debugger-pause.html (209556 => 209557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/worker/debugger-pause.html 2016-12-08 20:14:26 UTC (rev 209556)
+++ trunk/LayoutTests/inspector/worker/debugger-pause.html 2016-12-08 20:23:41 UTC (rev 209557)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // In each test, the Worker pauses and the Main Thread is waiting to
</span><del>- // pause on the next statement. Do an InspectorTest.log, which evalutes
</del><ins>+ // pause on the next statement. Do an InspectorTest.log, which evaluates
</ins><span class="cx"> // JavaScript in the page and should pause. Then later run work.
</span><span class="cx"> // In WebKit1, because the VM is shared between the inspector and
</span><span class="cx"> // inspected page we need to put an artificial break between our
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorworkerdebuggersharedbreakpointexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/worker/debugger-shared-breakpoint-expected.txt (0 => 209557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/worker/debugger-shared-breakpoint-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/worker/debugger-shared-breakpoint-expected.txt 2016-12-08 20:23:41 UTC (rev 209557)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+Ensure setting and removing a breakpoint affects all Workers sharing a resource by URL.
+
+
+== Running test suite: Worker.Debugger.SharedBreakpoint
+-- Running test case: Worker.Debugger.SharedBreakpoint.CreateWorkers
+PASS: Two Workers created.
+PASS: Two Workers ready.
+
+-- Running test case: Worker.Debugger.SharedBreakpoint.BreakpointAdded
+PASS: All Targets paused.
+PASS: Active CalleFrame should be in a Worker.
+PASS: Pause reason should be a breakpoint.
+PAUSE AT triggerBreakpoint:9:5
+ 5
+ 6 function triggerBreakpoint() {
+ 7 let alpha = 1;
+ -> 8 |let beta = 2; // BREAKPOINT
+ 9 let gamma = 3;
+ 10 }
+ 11
+
+
+
+-- Running test case: Worker.Debugger.SharedBreakpoint.BreakpointRemoved
+PASS: Worker 1 should not have paused.
+PASS: Worker 2 should not have paused.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorworkerdebuggersharedbreakpointhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/worker/debugger-shared-breakpoint.html (0 => 209557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/worker/debugger-shared-breakpoint.html (rev 0)
+++ trunk/LayoutTests/inspector/worker/debugger-shared-breakpoint.html 2016-12-08 20:23:41 UTC (rev 209557)
</span><span class="lines">@@ -0,0 +1,145 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script src="../debugger/resources/log-pause-location.js"></script>
+<script>
+let worker1, worker2;
+
+function triggerCreateWorkers() {
+ worker1 = new Worker("resources/worker-debugger-pause.js");
+ worker2 = new Worker("resources/worker-debugger-pause.js");
+ worker1.onmessage = worker2.onmessage = function(event) {
+ TestPage.dispatchEventToFrontend("WorkerResponded");
+ };
+}
+
+function triggerWorkerBreakpointPauses() {
+ worker1.postMessage("triggerBreakpoint");
+ worker2.postMessage("triggerBreakpoint");
+}
+
+function triggerWorkerResponse() {
+ worker1.postMessage("triggerResponse");
+ worker2.postMessage("triggerResponse");
+}
+
+function test()
+{
+ let breakpoint = null;
+ let workerTarget1, workerTarget2;
+
+ // In each test, the Worker pauses and the Main Thread is waiting to
+ // pause on the next statement. Do an InspectorTest.log, which evaluates
+ // 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);
+ });
+ });
+ }
+
+ function areAllTargetsPaused() {
+ for (let target of WebInspector.targets) {
+ let targetData = WebInspector.debuggerManager.dataForTarget(target);
+ if (!targetData.paused)
+ return false;
+ }
+ return true;
+ }
+
+ function whenAllTargetsPaused() {
+ InspectorTest.assert(!areAllTargetsPaused());
+ return new Promise((resolve, reject) => {
+ let listener = WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.CallFramesDidChange, (event) => {
+ if (areAllTargetsPaused()) {
+ WebInspector.debuggerManager.removeEventListener(WebInspector.DebuggerManager.Event.CallFramesDidChange, listener);
+ resolve();
+ }
+ });
+ });
+ }
+
+ let suite = InspectorTest.createAsyncSuite("Worker.Debugger.SharedBreakpoint");
+
+ suite.addTestCase({
+ name: "Worker.Debugger.SharedBreakpoint.CreateWorkers",
+ description: "Create multiple workers.",
+ test(resolve, reject) {
+ InspectorTest.evaluateInPage(`triggerCreateWorkers(); triggerWorkerResponse();`);
+ WebInspector.targetManager.singleFireEventListener(WebInspector.TargetManager.Event.TargetAdded, (event) => {
+ workerTarget1 = event.data.target;
+ WebInspector.targetManager.singleFireEventListener(WebInspector.TargetManager.Event.TargetAdded, (event) => {
+ workerTarget2 = event.data.target;
+ InspectorTest.pass("Two Workers created.");
+ });
+ });
+ InspectorTest.singleFireEventListener("WorkerResponded", () => {
+ InspectorTest.singleFireEventListener("WorkerResponded", () => {
+ InspectorTest.pass("Two Workers ready.");
+ resolve();
+ });
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "Worker.Debugger.SharedBreakpoint.BreakpointAdded",
+ description: "All workers should pause on the breakpoint after adding it.",
+ test(resolve, reject) {
+ InspectorTest.assert(workerTarget1.mainResource instanceof WebInspector.Script);
+ let location = workerTarget1.mainResource.createSourceCodeLocation(8, 0);
+ breakpoint = new WebInspector.Breakpoint(location);
+ WebInspector.debuggerManager.addBreakpoint(breakpoint);
+
+ InspectorTest.evaluateInPage(`triggerWorkerBreakpointPauses()`);
+ WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Paused, (event) => {
+ pauseTheMainThread();
+ whenAllTargetsPaused().then(() => {
+ let target = WebInspector.debuggerManager.activeCallFrame.target;
+ let targetData = WebInspector.debuggerManager.dataForTarget(target);
+
+ InspectorTest.pass("All Targets paused.");
+ InspectorTest.expectEqual(target.type, WebInspector.Target.Type.Worker, "Active CalleFrame should be in a Worker.");
+ InspectorTest.expectEqual(targetData.pauseReason, WebInspector.DebuggerManager.PauseReason.Breakpoint, "Pause reason should be a breakpoint.");
+ window.loadLinesFromSourceCode(target.mainResource).then(() => {
+ logPauseLocation();
+ WebInspector.debuggerManager.resume().then(resolve, reject);
+ });
+ });
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "Worker.Debugger.SharedBreakpoint.BreakpointRemoved",
+ description: "No worker should pause on the breakpoint after removing it.",
+ test(resolve, reject) {
+ WebInspector.debuggerManager.removeBreakpoint(breakpoint);
+
+ InspectorTest.evaluateInPage(`triggerWorkerBreakpointPauses()`);
+ InspectorTest.evaluateInPage(`triggerWorkerResponse()`);
+
+ InspectorTest.singleFireEventListener("WorkerResponded", () => {
+ InspectorTest.pass("Worker 1 should not have paused.");
+ InspectorTest.singleFireEventListener("WorkerResponded", () => {
+ InspectorTest.pass("Worker 2 should not have paused.");
+ resolve();
+ });
+ });
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Ensure setting and removing a breakpoint affects all Workers sharing a resource by URL.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorworkerresourcesworkerdebuggerpausejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/worker/resources/worker-debugger-pause.js (209556 => 209557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/worker/resources/worker-debugger-pause.js 2016-12-08 20:14:26 UTC (rev 209556)
+++ trunk/LayoutTests/inspector/worker/resources/worker-debugger-pause.js 2016-12-08 20:23:41 UTC (rev 209557)
</span><span class="lines">@@ -27,4 +27,6 @@
</span><span class="cx"> triggerException();
</span><span class="cx"> else if (event.data === "triggerAssertion")
</span><span class="cx"> triggerAssertion();
</span><ins>+ else if (event.data === "triggerResponse")
+ postMessage("response");
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (209556 => 209557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-12-08 20:14:26 UTC (rev 209556)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-12-08 20:23:41 UTC (rev 209557)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-12-08 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Unable to delete breakpoint from worker script
+ https://bugs.webkit.org/show_bug.cgi?id=165578
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Controllers/DebuggerManager.js:
+ (WebInspector.DebuggerManager.prototype._removeBreakpoint):
+ Match setting breakpoints. If this is a "URL breakpoint", affect
+ all targets. If this is a "Script breakpoint", affect just the
+ single target containing that Script.
+
</ins><span class="cx"> 2016-12-07 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r203912): Web Inspector: Navigation sidebar widths are not saved
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (209556 => 209557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2016-12-08 20:14:26 UTC (rev 209556)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2016-12-08 20:23:41 UTC (rev 209557)
</span><span class="lines">@@ -919,11 +919,12 @@
</span><span class="cx"> callback();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (breakpoint.target)
- breakpoint.target.DebuggerAgent.removeBreakpoint(breakpoint.identifier, didRemoveBreakpoint.bind(this));
- else {
</del><ins>+ if (breakpoint.contentIdentifier) {
</ins><span class="cx"> for (let target of WebInspector.targets)
</span><span class="cx"> target.DebuggerAgent.removeBreakpoint(breakpoint.identifier, didRemoveBreakpoint.bind(this));
</span><ins>+ } else if (breakpoint.scriptIdentifier) {
+ let target = breakpoint.target;
+ target.DebuggerAgent.removeBreakpoint(breakpoint.identifier, didRemoveBreakpoint.bind(this));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>