<!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>[195881] 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/195881">195881</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-29 19:31:32 -0800 (Fri, 29 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add support for variable size timeline graphs
https://bugs.webkit.org/show_bug.cgi?id=153690
<rdar://problem/24421696>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-01-29
Reviewed by Timothy Hatcher.
* UserInterface/Views/LayoutTimelineDataGrid.js:
(WebInspector.LayoutTimelineDataGrid): Deleted.
Remove unnecessary constructor.
* UserInterface/Views/TimelineOverviewGraph.js:
(WebInspector.TimelineOverviewGraph.prototype.set selectedRecord):
Default graph height.
* UserInterface/Views/RenderingFrameTimelineOverview.js:
(WebInspector.RenderingFrameTimelineOverview.prototype.get height):
Custom graph height.
* UserInterface/Views/TimelineOverview.js:
(WebInspector.TimelineOverview.prototype.get height):
Provide a way to get the height of the overview which accumulates graph heights.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView.prototype.get timelineOverviewHeight):
(WebInspector.TimelineRecordingContentView.prototype._updateTimelineOverviewHeight):
* UserInterface/Views/TimelineSidebarPanel.js:
(WebInspector.TimelineSidebarPanel.prototype._updateTimelineOverviewHeight):
Switch from assuming certain graph heights to asking the overview for its height.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineOverviewjs">trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewGraphjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (195880 => 195881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-01-30 03:19:07 UTC (rev 195880)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-01-30 03:31:32 UTC (rev 195881)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-01-29 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add support for variable size timeline graphs
+ https://bugs.webkit.org/show_bug.cgi?id=153690
+ <rdar://problem/24421696>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/LayoutTimelineDataGrid.js:
+ (WebInspector.LayoutTimelineDataGrid): Deleted.
+ Remove unnecessary constructor.
+
+ * UserInterface/Views/TimelineOverviewGraph.js:
+ (WebInspector.TimelineOverviewGraph.prototype.set selectedRecord):
+ Default graph height.
+
+ * UserInterface/Views/RenderingFrameTimelineOverview.js:
+ (WebInspector.RenderingFrameTimelineOverview.prototype.get height):
+ Custom graph height.
+
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview.prototype.get height):
+ Provide a way to get the height of the overview which accumulates graph heights.
+
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype.get timelineOverviewHeight):
+ (WebInspector.TimelineRecordingContentView.prototype._updateTimelineOverviewHeight):
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.prototype._updateTimelineOverviewHeight):
+ Switch from assuming certain graph heights to asking the overview for its height.
+
</ins><span class="cx"> 2016-01-29 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Object previews in the Console are misaligned
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGrid.js (195880 => 195881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGrid.js 2016-01-30 03:19:07 UTC (rev 195880)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGrid.js 2016-01-30 03:31:32 UTC (rev 195881)
</span><span class="lines">@@ -25,11 +25,6 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.LayoutTimelineDataGrid = class LayoutTimelineDataGrid extends WebInspector.TimelineDataGrid
</span><span class="cx"> {
</span><del>- constructor(treeOutline, columns, delegate, editCallback, deleteCallback)
- {
- super(treeOutline, columns, delegate, editCallback, deleteCallback);
- }
-
</del><span class="cx"> // Protected
</span><span class="cx">
</span><span class="cx"> callFramePopoverAnchorElement()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js (195880 => 195881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js 2016-01-30 03:19:07 UTC (rev 195880)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverview.js 2016-01-30 03:31:32 UTC (rev 195881)
</span><span class="lines">@@ -47,6 +47,11 @@
</span><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><ins>+ get height()
+ {
+ return 108;
+ }
+
</ins><span class="cx"> canShowTimeline(timeline)
</span><span class="cx"> {
</span><span class="cx"> return timeline.type === WebInspector.TimelineRecord.Type.RenderingFrame;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (195880 => 195881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-01-30 03:19:07 UTC (rev 195880)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-01-30 03:31:32 UTC (rev 195881)
</span><span class="lines">@@ -248,6 +248,14 @@
</span><span class="cx"> this._timelineRuler.selectionEndTime = this._timelineRuler.selectionStartTime + x;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get height()
+ {
+ let height = 0;
+ for (let graph of this._timelineOverviewGraphsMap.values())
+ height += graph.height;
+ return height;
+ }
+
</ins><span class="cx"> get visible()
</span><span class="cx"> {
</span><span class="cx"> return this._visible;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewGraphjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js (195880 => 195881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js 2016-01-30 03:19:07 UTC (rev 195880)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js 2016-01-30 03:31:32 UTC (rev 195881)
</span><span class="lines">@@ -161,6 +161,12 @@
</span><span class="cx"> this._needsSelectedRecordLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get height()
+ {
+ // Overridden by sub-classes if needed.
+ return 36;
+ }
+
</ins><span class="cx"> shown()
</span><span class="cx"> {
</span><span class="cx"> this._visible = true;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (195880 => 195881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-01-30 03:19:07 UTC (rev 195880)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-01-30 03:31:32 UTC (rev 195881)
</span><span class="lines">@@ -159,6 +159,11 @@
</span><span class="cx"> return (contentView instanceof WebInspector.TimelineView) ? contentView : null;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get timelineOverviewHeight()
+ {
+ return this._currentTimelineOverview.height;
+ }
+
</ins><span class="cx"> shown()
</span><span class="cx"> {
</span><span class="cx"> this._currentTimelineOverview.shown();
</span><span class="lines">@@ -560,21 +565,8 @@
</span><span class="cx"> _updateTimelineOverviewHeight()
</span><span class="cx"> {
</span><span class="cx"> const rulerHeight = 29;
</span><del>- const timelineHeight = 36;
- const renderingFramesTimelineHeight = 108;
-
- let overviewHeight;
- if (this.currentTimelineView && this.currentTimelineView.representedObject.type === WebInspector.TimelineRecord.Type.RenderingFrame)
- overviewHeight = renderingFramesTimelineHeight;
- else {
- let timelineCount = this._timelineViewMap.size;
- if (this._renderingFrameTimeline)
- timelineCount--;
-
- overviewHeight = timelineCount * timelineHeight;
- }
-
- let styleValue = (overviewHeight + rulerHeight) + "px";
</del><ins>+
+ let styleValue = (rulerHeight + this.timelineOverviewHeight) + "px";
</ins><span class="cx"> this._currentTimelineOverview.element.style.height = styleValue;
</span><span class="cx"> this._contentViewContainer.element.style.top = styleValue;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (195880 => 195881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2016-01-30 03:19:07 UTC (rev 195880)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2016-01-30 03:31:32 UTC (rev 195881)
</span><span class="lines">@@ -811,25 +811,13 @@
</span><span class="cx">
</span><span class="cx"> _updateTimelineOverviewHeight()
</span><span class="cx"> {
</span><del>- const timelineHeight = 36;
</del><span class="cx"> const eventTitleBarOffset = 58;
</span><span class="cx"> const contentElementOffset = 81;
</span><del>- const renderingFramesTimelineHeight = 108;
</del><span class="cx">
</span><span class="cx"> if (!this._displayedContentView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- let overviewHeight;
- let currentTimelineView = this._displayedContentView.currentTimelineView;
- if (currentTimelineView && currentTimelineView.representedObject.type === WebInspector.TimelineRecord.Type.RenderingFrame)
- overviewHeight = renderingFramesTimelineHeight;
- else {
- let timelineCount = this._timelineTreeElementMap.size;
- if (this._timelineTreeElementMap.has(WebInspector.TimelineRecord.Type.RenderingFrame))
- timelineCount--;
- overviewHeight = timelineCount * timelineHeight;
- }
-
</del><ins>+ let overviewHeight = this._displayedContentView.timelineOverviewHeight;
</ins><span class="cx"> this._timelineEventsTitleBarContainer.style.top = (overviewHeight + eventTitleBarOffset) + "px";
</span><span class="cx"> this.contentView.element.style.top = (overviewHeight + contentElementOffset) + "px";
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>