<!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>[201135] branches/safari-602.1.32-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/201135">201135</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-19 01:40:03 -0700 (Thu, 19 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200779">r200779</a>. rdar://problem/26239051</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchSourceWebInspectorUIChangeLog">branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsTimelineViewjs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog (201134 => 201135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-19 08:40:00 UTC (rev 201134)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-19 08:40:03 UTC (rev 201135)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2016-05-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r200779. rdar://problem/26239051
+
+ 2016-05-12 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: 11% of time in TimelineRecording spent updating DataGrid that is not visible
+ https://bugs.webkit.org/show_bug.cgi?id=157612
+ <rdar://problem/26239051>
+
+ Reviewed by Timothy Hatcher.
+
+ During recording, a timeline view is constantly having its cached time
+ values updated. These updates should only trigger forced layouts if the
+ view supports live data.
+
+ * UserInterface/Views/TimelineView.js:
+ (WebInspector.TimelineView.prototype.set zeroTime):
+ Drive-by fix, add call to _filterTimesDidChange.
+ (WebInspector.TimelineView.prototype.set startTime):
+ (WebInspector.TimelineView.prototype.set endTime):
+ (WebInspector.TimelineView.prototype.set currentTime):
+ Don't update layout directly.
+ (WebInspector.TimelineView.prototype._timesDidChange):
+ Force a layout if the view supports live data. When not recording,
+ a layout is always performed.
+ (WebInspector.TimelineView):
+ (WebInspector.TimelineView.prototype._filterTimesDidChange.delayedWork): Deleted.
+ Changed to an arrow function.
+ (WebInspector.TimelineView.prototype._filterTimesDidChange): Deleted.
+ Renamed _timesDidChange, since the method now does more than throttle
+ a filterDidChange call.
+
+2016-05-19 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r200767. rdar://problem/26231245
</span><span class="cx">
</span><span class="cx"> 2016-05-12 Matt Baker <mattbaker@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (201134 => 201135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2016-05-19 08:40:00 UTC (rev 201134)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2016-05-19 08:40:03 UTC (rev 201135)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> this._zeroTime = x;
</span><span class="cx">
</span><del>- this.needsLayout();
</del><ins>+ this._timesDidChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get startTime()
</span><span class="lines">@@ -97,8 +97,7 @@
</span><span class="cx">
</span><span class="cx"> this._startTime = x;
</span><span class="cx">
</span><del>- this._filterTimesDidChange();
- this.needsLayout();
</del><ins>+ this._timesDidChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get endTime()
</span><span class="lines">@@ -115,8 +114,7 @@
</span><span class="cx">
</span><span class="cx"> this._endTime = x;
</span><span class="cx">
</span><del>- this._filterTimesDidChange();
- this.needsLayout();
</del><ins>+ this._timesDidChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get currentTime()
</span><span class="lines">@@ -142,10 +140,8 @@
</span><span class="cx"> return this._startTime - wiggleTime <= currentTime && currentTime <= this._endTime + wiggleTime;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (checkIfLayoutIsNeeded.call(this, oldCurrentTime) || checkIfLayoutIsNeeded.call(this, this._currentTime)) {
- this._filterTimesDidChange();
- this.needsLayout();
- }
</del><ins>+ if (checkIfLayoutIsNeeded.call(this, oldCurrentTime) || checkIfLayoutIsNeeded.call(this, this._currentTime))
+ this._timesDidChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get filterStartTime()
</span><span class="lines">@@ -306,18 +302,18 @@
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _filterTimesDidChange()
</del><ins>+ _timesDidChange()
</ins><span class="cx"> {
</span><ins>+ if (!WebInspector.timelineManager.isCapturing() || this.showsLiveRecordingData)
+ this.needsLayout();
+
</ins><span class="cx"> if (!this._timelineDataGrid || this._updateFilterTimeout)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- function delayedWork()
- {
</del><ins>+ this._updateFilterTimeout = setTimeout(() => {
</ins><span class="cx"> this._updateFilterTimeout = undefined;
</span><span class="cx"> this._timelineDataGrid.filterDidChange();
</span><del>- }
-
- this._updateFilterTimeout = setTimeout(delayedWork.bind(this), 0);
</del><ins>+ }, 0);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>