<!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>[172764] branches/safari-600.1-branch/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/172764">172764</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-19 15:05:46 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172601">r172601</a>. <rdar://problem/18021462></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebInspectorUIChangeLog">branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTimelineContentViewjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172763 => 172764)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 21:39:23 UTC (rev 172763)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 22:05:46 UTC (rev 172764)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-08-19 Dana Burkart <dburkart@apple.com>
+
+ Merge r172601
+
+ 2014-08-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Timelines can get caught in requestAnimationFrame loop when not recording
+ https://bugs.webkit.org/show_bug.cgi?id=135946
+
+ Reviewed by Timothy Hatcher.
+
+ Each TimelineContentView was listening for the TimelineManager's start/stop
+ capturing events. However, only the active recording could possibly update.
+ Likewise, if a pre-existing recording started and stopped we did not properly
+ stop in the case where we were waiting for an event to update the current time,
+ which would result in an infinite rAF loop of no updates.
+
+ * UserInterface/Models/TimelineRecording.js:
+ (WebInspector.TimelineRecording.prototype.unloaded):
+ When a timeline recording is unloaded trigger an event.
+
+ * UserInterface/Views/TimelineContentView.js:
+ (WebInspector.TimelineContentView.prototype._startUpdatingCurrentTime):
+ Assert we were not already waiting.
+
+ (WebInspector.TimelineContentView.prototype._stopUpdatingCurrentTime):
+ Properly handle the case of starting/stoping an already existing recording
+ without a new event coming in.
+
+ (WebInspector.TimelineContentView.prototype._recordingTimesUpdated):
+ (WebInspector.TimelineContentView.prototype._recordingReset):
+ Convert to a boolean instead of deleting state.
+
+ (WebInspector.TimelineContentView.prototype._recordingUnloaded):
+ Stop listening to timeline manager events that no longer affect unloaded recordings.
+
</ins><span class="cx"> 2014-08-13 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172533
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTimelineContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineContentView.js (172763 => 172764)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineContentView.js 2014-08-19 21:39:23 UTC (rev 172763)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineContentView.js 2014-08-19 22:05:46 UTC (rev 172764)
</span><span class="lines">@@ -336,6 +336,7 @@
</span><span class="cx"> if (!isNaN(this._currentTime)) {
</span><span class="cx"> // We have a current time already, so we likely need to jump into the future to a better current time.
</span><span class="cx"> // This happens when you stop and later restart recording.
</span><ins>+ console.assert(!this._waitingToResetCurrentTime);
</ins><span class="cx"> this._waitingToResetCurrentTime = true;
</span><span class="cx"> this._recording.addEventListener(WebInspector.TimelineRecording.Event.TimesUpdated, this._recordingTimesUpdated, this);
</span><span class="cx"> }
</span><span class="lines">@@ -352,6 +353,12 @@
</span><span class="cx"> {
</span><span class="cx"> console.assert(this._updating);
</span><span class="cx"> this._updating = false;
</span><ins>+
+ if (this._waitingToResetCurrentTime) {
+ // Did not get any event while waiting for the current time, but we should stop waiting.
+ this._recording.removeEventListener(WebInspector.TimelineRecording.Event.TimesUpdated, this._recordingTimesUpdated, this);
+ this._waitingToResetCurrentTime = false;
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _capturingStarted: function(event)
</span><span class="lines">@@ -382,7 +389,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._recording.removeEventListener(WebInspector.TimelineRecording.Event.TimesUpdated, this._recordingTimesUpdated, this);
</span><del>- delete this._waitingToResetCurrentTime;
</del><ins>+ this._waitingToResetCurrentTime = false;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _clearTimeline: function(event)
</span><span class="lines">@@ -404,7 +411,7 @@
</span><span class="cx"> this._startTimeNeedsReset = true;
</span><span class="cx">
</span><span class="cx"> this._recording.removeEventListener(WebInspector.TimelineRecording.Event.TimesUpdated, this._recordingTimesUpdated, this);
</span><del>- delete this._waitingToResetCurrentTime;
</del><ins>+ this._waitingToResetCurrentTime = false;
</ins><span class="cx">
</span><span class="cx"> this._overviewTimelineView.reset();
</span><span class="cx"> for (var timelineView of this._discreteTimelineViewMap.values())
</span></span></pre>
</div>
</div>
</body>
</html>