<!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>[172203] trunk/Source/WebInspectorUI</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/172203">172203</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-08-06 23:14:54 -0700 (Wed, 06 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: ReplayManager should unpause and suppress breakpoints before capturing/replaying
https://bugs.webkit.org/show_bug.cgi?id=135608

Reviewed by Timothy Hatcher.

It is jarring when the debugger pauses during capturing or replaying. For now, we should suppress
all breakpoints during capturing or replaying, and restore breakpoint enabled state when
capturing finishes, when replaying finishes, or during temporary replay pauses.

In the future, the debugger will be selectively enabled during playback to seek to specific
breakpoint hits. This is tracked in https://bugs.webkit.org/show_bug.cgi?id=135663.

* UserInterface/Controllers/ReplayManager.js:
(WebInspector.ReplayManager.prototype.startCapturing.result):
(WebInspector.ReplayManager.prototype.replayToPosition.result):
(WebInspector.ReplayManager.prototype.replayToCompletion.result):
(WebInspector.ReplayManager.prototype.captureStopped):
(WebInspector.ReplayManager.prototype.playbackPaused):
(WebInspector.ReplayManager.prototype.playbackFinished):
(WebInspector.ReplayManager.prototype._changeSegmentState):
(WebInspector.ReplayManager.prototype._suppressBreakpointsAndResumeIfNeeded):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersReplayManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (172202 => 172203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2014-08-07 05:12:00 UTC (rev 172202)
+++ trunk/Source/WebInspectorUI/ChangeLog        2014-08-07 06:14:54 UTC (rev 172203)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-08-06  Brian J. Burg  &lt;burg@cs.washington.edu&gt;
+
+        Web Inspector: ReplayManager should unpause and suppress breakpoints before capturing/replaying
+        https://bugs.webkit.org/show_bug.cgi?id=135608
+
+        Reviewed by Timothy Hatcher.
+
+        It is jarring when the debugger pauses during capturing or replaying. For now, we should suppress
+        all breakpoints during capturing or replaying, and restore breakpoint enabled state when
+        capturing finishes, when replaying finishes, or during temporary replay pauses.
+
+        In the future, the debugger will be selectively enabled during playback to seek to specific
+        breakpoint hits. This is tracked in https://bugs.webkit.org/show_bug.cgi?id=135663.
+
+        * UserInterface/Controllers/ReplayManager.js:
+        (WebInspector.ReplayManager.prototype.startCapturing.result):
+        (WebInspector.ReplayManager.prototype.replayToPosition.result):
+        (WebInspector.ReplayManager.prototype.replayToCompletion.result):
+        (WebInspector.ReplayManager.prototype.captureStopped):
+        (WebInspector.ReplayManager.prototype.playbackPaused):
+        (WebInspector.ReplayManager.prototype.playbackFinished):
+        (WebInspector.ReplayManager.prototype._changeSegmentState):
+        (WebInspector.ReplayManager.prototype._suppressBreakpointsAndResumeIfNeeded):
+
</ins><span class="cx"> 2014-08-06  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Win] Build fix.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersReplayManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js (172202 => 172203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js        2014-08-07 05:12:00 UTC (rev 172202)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js        2014-08-07 06:14:54 UTC (rev 172203)
</span><span class="lines">@@ -248,6 +248,8 @@
</span><span class="cx">             });
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        result = result.then(this._suppressBreakpointsAndResumeIfNeeded());
+
</ins><span class="cx">         result = result.then(function() {
</span><span class="cx">                 console.assert(manager.sessionState === WebInspector.ReplayManager.SessionState.Inactive);
</span><span class="cx">                 console.assert(manager.segmentState === WebInspector.ReplayManager.SegmentState.Unloaded);
</span><span class="lines">@@ -343,6 +345,8 @@
</span><span class="cx">             });
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        result = result.then(this._suppressBreakpointsAndResumeIfNeeded());
+
</ins><span class="cx">         result = result.then(function() {
</span><span class="cx">                 console.assert(manager.sessionState !== WebInspector.ReplayManager.SessionState.Capturing);
</span><span class="cx">                 console.assert(manager.segmentState !== WebInspector.ReplayManager.SegmentState.Appending);
</span><span class="lines">@@ -372,6 +376,8 @@
</span><span class="cx">             });
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        result = result.then(this._suppressBreakpointsAndResumeIfNeeded());
+
</ins><span class="cx">         result = result.then(function() {
</span><span class="cx">                 console.assert(manager.sessionState !== WebInspector.ReplayManager.SessionState.Capturing);
</span><span class="cx">                 console.assert(manager.segmentState === WebInspector.ReplayManager.SegmentState.Loaded || manager.segmentState === WebInspector.ReplayManager.SegmentState.Unloaded);
</span><span class="lines">@@ -409,6 +415,11 @@
</span><span class="cx">         this._changeSessionState(WebInspector.ReplayManager.SessionState.Inactive);
</span><span class="cx">         this._changeSegmentState(WebInspector.ReplayManager.SegmentState.Unloaded);
</span><span class="cx"> 
</span><ins>+        if (this._breakpointsWereSuppressed) {
+            delete this._breakpointsWereSuppressed;
+            WebInspector.debuggerManager.breakpointsEnabled = true;
+        }
+
</ins><span class="cx">         this.dispatchEventToListeners(WebInspector.ReplayManager.Event.CaptureStopped);
</span><span class="cx">     },
</span><span class="cx"> 
</span><span class="lines">@@ -446,6 +457,11 @@
</span><span class="cx">         console.assert(this.sessionState === WebInspector.ReplayManager.SessionState.Replaying);
</span><span class="cx">         this._changeSegmentState(WebInspector.ReplayManager.SegmentState.Loaded);
</span><span class="cx"> 
</span><ins>+        if (this._breakpointsWereSuppressed) {
+            delete this._breakpointsWereSuppressed;
+            WebInspector.debuggerManager.breakpointsEnabled = true;
+        }
+
</ins><span class="cx">         this.dispatchEventToListeners(WebInspector.ReplayManager.Event.PlaybackPaused);
</span><span class="cx">     },
</span><span class="cx"> 
</span><span class="lines">@@ -457,6 +473,11 @@
</span><span class="cx">         this._changeSessionState(WebInspector.ReplayManager.SessionState.Inactive);
</span><span class="cx">         console.assert(this.segmentState === WebInspector.ReplayManager.SegmentState.Unloaded);
</span><span class="cx"> 
</span><ins>+        if (this._breakpointsWereSuppressed) {
+            delete this._breakpointsWereSuppressed;
+            WebInspector.debuggerManager.breakpointsEnabled = true;
+        }
+
</ins><span class="cx">         this.dispatchEventToListeners(WebInspector.ReplayManager.Event.PlaybackFinished);
</span><span class="cx">     },
</span><span class="cx"> 
</span><span class="lines">@@ -645,6 +666,21 @@
</span><span class="cx">         console.assert(isAllowed, &quot;Invalid segment state change: &quot;, this._segmentState, &quot; to &quot;, newState);
</span><span class="cx">         if (isAllowed)
</span><span class="cx">             this._segmentState = newState;
</span><ins>+    },
+
+    _suppressBreakpointsAndResumeIfNeeded: function()
+    {
+        var manager = this;
+
+        return new Promise(function(resolve, reject) {
+            manager._breakpointsWereSuppressed = WebInspector.debuggerManager.breakpointsEnabled;
+            WebInspector.debuggerManager.breakpointsEnabled = false;
+            if (!WebInspector.debuggerManager.paused)
+                return resolve();
+
+            WebInspector.debuggerManager.resume();
+            WebInspector.debuggerManager.addSingleFireEventListener(WebInspector.DebuggerManager.Event.Resumed, resolve);
+        });
</ins><span class="cx">     }
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>