<!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>[195504] 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/195504">195504</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-22 22:46:56 -0800 (Fri, 22 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Reduce unnecessary forced layouts in TimelineRuler
https://bugs.webkit.org/show_bug.cgi?id=153390
<rdar://problem/24312241>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-01-22
Reviewed by Timothy Hatcher.
TimelineRuler's width rarely changes. It should only need to calculate
its width when added to the DOM or if the content view containing it
has resized and the bounds of the ruler may have changed.
Switch everything in TimelineRuler to using a cached width, and add
an explicit method, resize, to update this width. This eliminated
frequent hangs I was seeing while recording timelines.
* UserInterface/Views/OverviewTimelineView.js:
(WebInspector.OverviewTimelineView.prototype.shown):
(WebInspector.OverviewTimelineView.prototype.updateLayoutForResize):
Resize the ruler when the view is shown or resized.
* UserInterface/Views/TimelineOverview.js:
(WebInspector.TimelineOverview.prototype.shown):
(WebInspector.TimelineOverview.prototype.updateLayoutForResize):
Resize the ruler when the view is shown or resized.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView.prototype.layout):
Inform the current content view of a resize if possible.
* UserInterface/Views/TimelineRuler.js:
(WebInspector.TimelineRuler.prototype.resize):
Update the width.
(WebInspector.TimelineRuler.prototype._recalculate):
(WebInspector.TimelineRuler.prototype._needsMarkerLayout):
(WebInspector.TimelineRuler.prototype._needsSelectionLayout):
(WebInspector.TimelineRuler.prototype._handleMouseMove):
(WebInspector.TimelineRuler.prototype._handleSelectionHandleMouseMove):
Use cached width.
* UserInterface/Views/TimelineRecordBar.js:
(WebInspector.TimelineRecordBar.createCombinedBars): Deleted.
Remove some stale code.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsOverviewTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordBarjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (195503 => 195504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-01-23 03:24:42 UTC (rev 195503)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-01-23 06:46:56 UTC (rev 195504)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2016-01-22 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Reduce unnecessary forced layouts in TimelineRuler
+ https://bugs.webkit.org/show_bug.cgi?id=153390
+ <rdar://problem/24312241>
+
+ Reviewed by Timothy Hatcher.
+
+ TimelineRuler's width rarely changes. It should only need to calculate
+ its width when added to the DOM or if the content view containing it
+ has resized and the bounds of the ruler may have changed.
+
+ Switch everything in TimelineRuler to using a cached width, and add
+ an explicit method, resize, to update this width. This eliminated
+ frequent hangs I was seeing while recording timelines.
+
+ * UserInterface/Views/OverviewTimelineView.js:
+ (WebInspector.OverviewTimelineView.prototype.shown):
+ (WebInspector.OverviewTimelineView.prototype.updateLayoutForResize):
+ Resize the ruler when the view is shown or resized.
+
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview.prototype.shown):
+ (WebInspector.TimelineOverview.prototype.updateLayoutForResize):
+ Resize the ruler when the view is shown or resized.
+
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype.layout):
+ Inform the current content view of a resize if possible.
+
+ * UserInterface/Views/TimelineRuler.js:
+ (WebInspector.TimelineRuler.prototype.resize):
+ Update the width.
+
+ (WebInspector.TimelineRuler.prototype._recalculate):
+ (WebInspector.TimelineRuler.prototype._needsMarkerLayout):
+ (WebInspector.TimelineRuler.prototype._needsSelectionLayout):
+ (WebInspector.TimelineRuler.prototype._handleMouseMove):
+ (WebInspector.TimelineRuler.prototype._handleSelectionHandleMouseMove):
+ Use cached width.
+
+ * UserInterface/Views/TimelineRecordBar.js:
+ (WebInspector.TimelineRecordBar.createCombinedBars): Deleted.
+ Remove some stale code.
+
</ins><span class="cx"> 2016-01-22 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Sidebar's should remember their width's
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsOverviewTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js (195503 => 195504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2016-01-23 03:24:42 UTC (rev 195503)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2016-01-23 06:46:56 UTC (rev 195504)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> super.shown();
</span><span class="cx">
</span><span class="cx"> this._treeOutlineDataGridSynchronizer.synchronize();
</span><ins>+ this._timelineRuler.resize();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> closed()
</span><span class="lines">@@ -159,6 +160,11 @@
</span><span class="cx"> WebInspector.showOriginalOrFormattedSourceCodeLocation(treeElement.sourceCodeTimeline.sourceCodeLocation);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ updateLayoutForResize()
+ {
+ this._timelineRuler.resize();
+ }
+
</ins><span class="cx"> layout()
</span><span class="cx"> {
</span><span class="cx"> let oldZeroTime = this._timelineRuler.zeroTime;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (195503 => 195504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-01-23 03:24:42 UTC (rev 195503)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-01-23 06:46:56 UTC (rev 195504)
</span><span class="lines">@@ -257,6 +257,8 @@
</span><span class="cx"> {
</span><span class="cx"> this._visible = true;
</span><span class="cx">
</span><ins>+ this._timelineRuler.resize()
+
</ins><span class="cx"> for (var timelineOverviewGraph of this._timelineOverviewGraphsMap.values())
</span><span class="cx"> timelineOverviewGraph.shown();
</span><span class="cx">
</span><span class="lines">@@ -313,6 +315,7 @@
</span><span class="cx"> updateLayoutForResize()
</span><span class="cx"> {
</span><span class="cx"> this._cachedScrollContainerWidth = NaN;
</span><ins>+ this._timelineRuler.resize()
</ins><span class="cx"> this.updateLayout();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordBarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js (195503 => 195504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js 2016-01-23 03:24:42 UTC (rev 195503)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js 2016-01-23 06:46:56 UTC (rev 195504)
</span><span class="lines">@@ -125,8 +125,6 @@
</span><span class="cx"> visibleRecords.sort(compareByActiveStartTime);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- lastRecordType = null;
-
</del><span class="cx"> var activeStartTime = NaN;
</span><span class="cx"> var activeEndTime = NaN;
</span><span class="cx"> var activeRecords = [];
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (195503 => 195504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-01-23 03:24:42 UTC (rev 195503)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-01-23 06:46:56 UTC (rev 195504)
</span><span class="lines">@@ -324,6 +324,10 @@
</span><span class="cx"> layout()
</span><span class="cx"> {
</span><span class="cx"> this._currentTimelineOverview.updateLayoutForResize();
</span><ins>+
+ let currentContentView = this._contentViewContainer.currentContentView;
+ if (currentContentView && currentContentView.updateLayoutForResize)
+ currentContentView.updateLayoutForResize();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Private
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (195503 => 195504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2016-01-23 03:24:42 UTC (rev 195503)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2016-01-23 06:46:56 UTC (rev 195504)
</span><span class="lines">@@ -506,7 +506,7 @@
</span><span class="cx"> this._scheduledMarkerLayoutUpdateIdentifier = requestAnimationFrame(() => {
</span><span class="cx"> this._scheduledMarkerLayoutUpdateIdentifier = undefined;
</span><span class="cx">
</span><del>- let visibleWidth = this.element.clientWidth;
</del><ins>+ let visibleWidth = this._cachedClientWidth;
</ins><span class="cx"> if (visibleWidth <= 0)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> this._scheduledSelectionLayoutUpdateIdentifier = requestAnimationFrame(() => {
</span><span class="cx"> this._scheduledSelectionLayoutUpdateIdentifier = undefined;
</span><span class="cx">
</span><del>- let visibleWidth = this.element.clientWidth;
</del><ins>+ let visibleWidth = this._cachedClientWidth;
</ins><span class="cx"> if (visibleWidth <= 0)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -537,9 +537,15 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ resize()
+ {
+ this._cachedClientWidth = this.element.clientWidth;
+ this._recalculate();
+ }
+
</ins><span class="cx"> _recalculate()
</span><span class="cx"> {
</span><del>- let visibleWidth = this.element.clientWidth;
</del><ins>+ let visibleWidth = this._cachedClientWidth;
</ins><span class="cx"> if (visibleWidth <= 0)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -732,7 +738,7 @@
</span><span class="cx"> this.element.classList.add(WebInspector.TimelineRuler.ResizingSelectionStyleClassName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- this._updateSelection(this.element.clientWidth, this.duration);
</del><ins>+ this._updateSelection(this._cachedClientWidth, this.duration);
</ins><span class="cx">
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> event.stopPropagation();
</span><span class="lines">@@ -826,7 +832,7 @@
</span><span class="cx"> this.selectionEndTime = Math.min(Math.max(this.selectionStartTime + this.minimumSelectionDuration, currentTime), this.endTime);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- this._updateSelection(this.element.clientWidth, this.duration);
</del><ins>+ this._updateSelection(this._cachedClientWidth, this.duration);
</ins><span class="cx">
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> event.stopPropagation();
</span></span></pre>
</div>
</div>
</body>
</html>