<!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>[242588] 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/242588">242588</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2019-03-06 19:21:19 -0800 (Wed, 06 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: DOM Debugger: event breakpoints still fire when breakpoints are disabled
https://bugs.webkit.org/show_bug.cgi?id=195377
<rdar://problem/48651645>

Reviewed by Joseph Pecoraro and Matt Baker.

Source/WebCore:

Test: inspector/dom-debugger/event-listener-breakpoints.html

* inspector/agents/InspectorDOMDebuggerAgent.cpp:
(WebCore::InspectorDOMDebuggerAgent::willHandleEvent):
(WebCore::InspectorDOMDebuggerAgent::willFireTimer):
(WebCore::InspectorDOMDebuggerAgent::willFireAnimationFrame):

LayoutTests:

* inspector/dom-debugger/event-listener-breakpoints.html:
* inspector/dom-debugger/event-listener-breakpoints-expected.txt:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectordomdebuggereventlistenerbreakpointsexpectedtxt">trunk/LayoutTests/inspector/dom-debugger/event-listener-breakpoints-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordomdebuggereventlistenerbreakpointshtml">trunk/LayoutTests/inspector/dom-debugger/event-listener-breakpoints.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectoragentsInspectorDOMDebuggerAgentcpp">trunk/Source/WebCore/inspector/agents/InspectorDOMDebuggerAgent.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (242587 => 242588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-03-07 03:11:38 UTC (rev 242587)
+++ trunk/LayoutTests/ChangeLog 2019-03-07 03:21:19 UTC (rev 242588)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-03-06  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: DOM Debugger: event breakpoints still fire when breakpoints are disabled
+        https://bugs.webkit.org/show_bug.cgi?id=195377
+        <rdar://problem/48651645>
+
+        Reviewed by Joseph Pecoraro and Matt Baker.
+
+        * inspector/dom-debugger/event-listener-breakpoints.html:
+        * inspector/dom-debugger/event-listener-breakpoints-expected.txt:
+
</ins><span class="cx"> 2019-03-06  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Crash when attempting to change input type while dismissing datalist suggestions
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomdebuggereventlistenerbreakpointsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom-debugger/event-listener-breakpoints-expected.txt (242587 => 242588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom-debugger/event-listener-breakpoints-expected.txt 2019-03-07 03:11:38 UTC (rev 242587)
+++ trunk/LayoutTests/inspector/dom-debugger/event-listener-breakpoints-expected.txt    2019-03-07 03:21:19 UTC (rev 242588)
</span><span class="lines">@@ -79,5 +79,18 @@
</span><span class="cx"> 0: [F] handleBody_click
</span><span class="cx"> 1: [F] clickX
</span><span class="cx"> 2: [P] Global Code
</span><ins>+PASS: Should have paused twice.
</ins><span class="cx"> -- Running test teardown.
</span><span class="cx"> 
</span><ins>+-- Running test case: DOMDebugger.Event.Listener.DisableBetweenDispatches
+Adding "click" Event Breakpoint...
+Firing "click" on div#x...
+PASS: Should pause before event handler is run.
+CALL STACK:
+0: [F] handleX_click
+1: [F] clickX
+2: [P] Global Code
+Disabling breakpoints...
+PASS: Should have paused once.
+-- Running test teardown.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordomdebuggereventlistenerbreakpointshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom-debugger/event-listener-breakpoints.html (242587 => 242588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom-debugger/event-listener-breakpoints.html 2019-03-07 03:11:38 UTC (rev 242587)
+++ trunk/LayoutTests/inspector/dom-debugger/event-listener-breakpoints.html    2019-03-07 03:21:19 UTC (rev 242588)
</span><span class="lines">@@ -126,12 +126,15 @@
</span><span class="cx"> 
</span><span class="cx">                 WI.debuggerManager.resume()
</span><span class="cx">                 .catch(reject);
</span><ins>+            });
</ins><span class="cx"> 
</span><del>-                if (pauseCount >= 2) {
-                    WI.debuggerManager.removeEventListener(WI.DebuggerManager.Event.Paused, listener);
</del><ins>+            InspectorTest.singleFireEventListener(`TestPage-click`, (event) => {
+                InspectorTest.expectEqual(pauseCount, 2, "Should have paused twice.");
+                InspectorTest.assert(!WI.debuggerManager.paused, "Should not be paused.");
</ins><span class="cx"> 
</span><del>-                    resolve();
-                }
</del><ins>+                WI.debuggerManager.removeEventListener(WI.DebuggerManager.Event.Paused, listener);
+
+                resolve();
</ins><span class="cx">             });
</span><span class="cx"> 
</span><span class="cx">             InspectorTest.EventBreakpoint.addBreakpoint(WI.EventBreakpoint.Type.Listener, "click")
</span><span class="lines">@@ -144,6 +147,44 @@
</span><span class="cx">         teardown: InspectorTest.EventBreakpoint.teardown,
</span><span class="cx">     });
</span><span class="cx"> 
</span><ins>+    suite.addTestCase({
+        name: `DOMDebugger.Event.Listener.DisableBetweenDispatches`,
+        description: "Check that event listener breakpoints only pause when breakpoints are enabled.",
+        test(resolve, reject) {
+            let pauseCount = 0;
+
+            let listener = WI.debuggerManager.addEventListener(WI.DebuggerManager.Event.Paused, (event) => {
+                ++pauseCount;
+
+                InspectorTest.pass("Should pause before event handler is run.");
+                logActiveStackTrace();
+
+                InspectorTest.log("Disabling breakpoints...");
+                DebuggerAgent.setBreakpointsActive(false)
+                .then(() => WI.debuggerManager.resume())
+                .catch(reject);
+            });
+
+            InspectorTest.singleFireEventListener(`TestPage-click`, (event) => {
+                InspectorTest.expectEqual(pauseCount, 1, "Should have paused once.");
+                InspectorTest.assert(!WI.debuggerManager.paused, "Should not be paused.");
+
+                WI.debuggerManager.removeEventListener(WI.DebuggerManager.Event.Paused, listener);
+
+                DebuggerAgent.setBreakpointsActive(true)
+                .then(resolve, reject);
+            });
+
+            InspectorTest.EventBreakpoint.addBreakpoint(WI.EventBreakpoint.Type.Listener, "click")
+            .then(() => {
+                InspectorTest.log("Firing \"click\" on div#x...");
+                return InspectorTest.evaluateInPage(`clickX()`);
+            })
+            .catch(reject);
+        },
+        teardown: InspectorTest.EventBreakpoint.teardown,
+    });
+
</ins><span class="cx">     suite.runTestCasesAndFinish();
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (242587 => 242588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-03-07 03:11:38 UTC (rev 242587)
+++ trunk/Source/WebCore/ChangeLog      2019-03-07 03:21:19 UTC (rev 242588)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2019-03-06  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: DOM Debugger: event breakpoints still fire when breakpoints are disabled
+        https://bugs.webkit.org/show_bug.cgi?id=195377
+        <rdar://problem/48651645>
+
+        Reviewed by Joseph Pecoraro and Matt Baker.
+
+        Test: inspector/dom-debugger/event-listener-breakpoints.html
+
+        * inspector/agents/InspectorDOMDebuggerAgent.cpp:
+        (WebCore::InspectorDOMDebuggerAgent::willHandleEvent):
+        (WebCore::InspectorDOMDebuggerAgent::willFireTimer):
+        (WebCore::InspectorDOMDebuggerAgent::willFireAnimationFrame):
+
</ins><span class="cx"> 2019-03-06  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Crash when attempting to change input type while dismissing datalist suggestions
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectoragentsInspectorDOMDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/agents/InspectorDOMDebuggerAgent.cpp (242587 => 242588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/agents/InspectorDOMDebuggerAgent.cpp      2019-03-07 03:11:38 UTC (rev 242587)
+++ trunk/Source/WebCore/inspector/agents/InspectorDOMDebuggerAgent.cpp 2019-03-07 03:21:19 UTC (rev 242588)
</span><span class="lines">@@ -367,6 +367,9 @@
</span><span class="cx"> 
</span><span class="cx"> void InspectorDOMDebuggerAgent::willHandleEvent(const Event& event, const RegisteredEventListener& registeredEventListener)
</span><span class="cx"> {
</span><ins>+    if (!m_debuggerAgent->breakpointsActive())
+        return;
+
</ins><span class="cx">     bool shouldPause = m_debuggerAgent->pauseOnNextStatementEnabled() || m_eventBreakpoints.contains(std::make_pair(Inspector::Protocol::DOMDebugger::EventBreakpointType::Listener, event.type()));
</span><span class="cx"> 
</span><span class="cx">     if (!shouldPause && m_domAgent)
</span><span class="lines">@@ -388,6 +391,9 @@
</span><span class="cx"> 
</span><span class="cx"> void InspectorDOMDebuggerAgent::willFireTimer(bool oneShot)
</span><span class="cx"> {
</span><ins>+    if (!m_debuggerAgent->breakpointsActive())
+        return;
+
</ins><span class="cx">     String eventName = oneShot ? "setTimeout"_s : "setInterval"_s;
</span><span class="cx">     bool shouldPause = m_debuggerAgent->pauseOnNextStatementEnabled() || m_eventBreakpoints.contains(std::make_pair(Inspector::Protocol::DOMDebugger::EventBreakpointType::Timer, eventName));
</span><span class="cx">     if (!shouldPause)
</span><span class="lines">@@ -400,6 +406,9 @@
</span><span class="cx"> 
</span><span class="cx"> void InspectorDOMDebuggerAgent::willFireAnimationFrame()
</span><span class="cx"> {
</span><ins>+    if (!m_debuggerAgent->breakpointsActive())
+        return;
+
</ins><span class="cx">     String eventName = "requestAnimationFrame"_s;
</span><span class="cx">     bool shouldPause = m_debuggerAgent->pauseOnNextStatementEnabled() || m_eventBreakpoints.contains(std::make_pair(Inspector::Protocol::DOMDebugger::EventBreakpointType::AnimationFrame, eventName));
</span><span class="cx">     if (!shouldPause)
</span></span></pre>
</div>
</div>

</body>
</html>