<!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>[242740] 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/242740">242740</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2019-03-11 14:26:50 -0700 (Mon, 11 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: CPU Usage Timeline - Better Thread chart layout values
https://bugs.webkit.org/show_bug.cgi?id=195547

Reviewed by Devin Rousso.

* UserInterface/Views/CPUTimelineView.js:
(WI.CPUTimelineView.prototype.layout.bestThreadLayoutMax):
(WI.CPUTimelineView.prototype.layout.layoutView):
(WI.CPUTimelineView.prototype._showGraphOverlay):
Include a separate layoutMax for the combined view and a thread layoutMax
for the thread groups.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCPUTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (242739 => 242740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog    2019-03-11 21:26:47 UTC (rev 242739)
+++ trunk/Source/WebInspectorUI/ChangeLog       2019-03-11 21:26:50 UTC (rev 242740)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2019-03-11  Joseph Pecoraro  <pecoraro@apple.com>
</span><span class="cx"> 
</span><ins>+        Web Inspector: CPU Usage Timeline - Better Thread chart layout values
+        https://bugs.webkit.org/show_bug.cgi?id=195547
+
+        Reviewed by Devin Rousso.
+
+        * UserInterface/Views/CPUTimelineView.js:
+        (WI.CPUTimelineView.prototype.layout.bestThreadLayoutMax):
+        (WI.CPUTimelineView.prototype.layout.layoutView):
+        (WI.CPUTimelineView.prototype._showGraphOverlay):
+        Include a separate layoutMax for the combined view and a thread layoutMax
+        for the thread groups.
+
+2019-03-11  Joseph Pecoraro  <pecoraro@apple.com>
+
</ins><span class="cx">         Web Inspector: CPU Usage Timeline - Add legend and graph hover effects
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=195390
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCPUTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js (242739 => 242740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js       2019-03-11 21:26:47 UTC (rev 242739)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js  2019-03-11 21:26:50 UTC (rev 242740)
</span><span class="lines">@@ -460,6 +460,7 @@
</span><span class="cx">         let mainThreadMax = -Infinity;
</span><span class="cx">         let webkitThreadMax = -Infinity;
</span><span class="cx">         let unknownThreadMax = -Infinity;
</span><ins>+        let workerMax = -Infinity;
</ins><span class="cx"> 
</span><span class="cx">         let min = Infinity;
</span><span class="cx">         let mainThreadMin = Infinity;
</span><span class="lines">@@ -577,8 +578,11 @@
</span><span class="cx">         webkitThreadAverage /= visibleRecords.length;
</span><span class="cx">         unknownThreadAverage /= visibleRecords.length;
</span><span class="cx"> 
</span><del>-        for (let [workerId, workerData] of workersDataMap)
</del><ins>+        for (let [workerId, workerData] of workersDataMap) {
</ins><span class="cx">             workerData.average = workerData.average / workerData.recordsCount;
</span><ins>+            if (workerData.max > workerMax)
+                workerMax = workerData.max;
+        }
</ins><span class="cx"> 
</span><span class="cx">         // If the graph end time is inside a gap, the last data point should
</span><span class="cx">         // only be extended to the start of the discontinuity.
</span><span class="lines">@@ -585,6 +589,12 @@
</span><span class="cx">         if (discontinuities.length)
</span><span class="cx">             visibleEndTime = discontinuities[0].startTime;
</span><span class="cx"> 
</span><ins>+        function bestThreadLayoutMax(value) {
+            if (value > 100)
+                return Math.ceil(value);            
+            return (Math.floor(value / 25) + 1) * 25;
+        }
+
</ins><span class="cx">         function removeGreaterThan(arr, max) {
</span><span class="cx">             return arr.filter((x) => x <= max);
</span><span class="cx">         }
</span><span class="lines">@@ -621,12 +631,7 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        // Layout all graphs to the same time scale. The maximum value is
-        // the maximum total CPU usage across all threads.
-        let layoutMax = max;
-        this._layoutMax = max;
-
-        function layoutView(view, property, graphHeight, {dataPoints, min, max, average}) {
</del><ins>+        function layoutView(view, property, graphHeight, layoutMax, {dataPoints, min, max, average}) {
</ins><span class="cx">             if (min === Infinity)
</span><span class="cx">                 min = 0;
</span><span class="cx">             if (max === -Infinity)
</span><span class="lines">@@ -685,12 +690,17 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        layoutView(this._cpuUsageView, null, CPUTimelineView.cpuUsageViewHeight, {dataPoints, min, max, average});
</del><ins>+        // Layout the combined graph to the maximum total CPU usage.
+        // Layout all the thread graphs to the same time scale, the maximum across threads / thread groups.
+        this._layoutMax = max;
+        this._threadLayoutMax = bestThreadLayoutMax(Math.max(mainThreadMax, webkitThreadMax, unknownThreadMax, workerMax));
</ins><span class="cx"> 
</span><ins>+        layoutView(this._cpuUsageView, null, CPUTimelineView.cpuUsageViewHeight, this._layoutMax, {dataPoints, min, max, average});
+
</ins><span class="cx">         if (this._threadsDetailsElement.open) {
</span><del>-            layoutView(this._mainThreadUsageView, "mainThreadUsage", CPUTimelineView.threadCPUUsageViewHeight, {dataPoints, min: mainThreadMin, max: mainThreadMax, average: mainThreadAverage});
-            layoutView(this._webkitThreadUsageView, "webkitThreadUsage", CPUTimelineView.threadCPUUsageViewHeight, {dataPoints, min: webkitThreadMin, max: webkitThreadMax, average: webkitThreadAverage});
-            layoutView(this._unknownThreadUsageView, "unknownThreadUsage", CPUTimelineView.threadCPUUsageViewHeight, {dataPoints, min: unknownThreadMin, max: unknownThreadMax, average: unknownThreadAverage});
</del><ins>+            layoutView(this._mainThreadUsageView, "mainThreadUsage", CPUTimelineView.threadCPUUsageViewHeight, this._threadLayoutMax, {dataPoints, min: mainThreadMin, max: mainThreadMax, average: mainThreadAverage});
+            layoutView(this._webkitThreadUsageView, "webkitThreadUsage", CPUTimelineView.threadCPUUsageViewHeight, this._threadLayoutMax, {dataPoints, min: webkitThreadMin, max: webkitThreadMax, average: webkitThreadAverage});
+            layoutView(this._unknownThreadUsageView, "unknownThreadUsage", CPUTimelineView.threadCPUUsageViewHeight, this._threadLayoutMax, {dataPoints, min: unknownThreadMin, max: unknownThreadMax, average: unknownThreadAverage});
</ins><span class="cx"> 
</span><span class="cx">             this._removeWorkerThreadViews();
</span><span class="cx"> 
</span><span class="lines">@@ -704,7 +714,7 @@
</span><span class="cx">                 this._threadsDetailsElement.insertBefore(workerView.element, this._webkitThreadUsageView.element);
</span><span class="cx">                 this._workerViews.push(workerView);
</span><span class="cx"> 
</span><del>-                layoutView(workerView, "usage", CPUTimelineView.threadCPUUsageViewHeight, {dataPoints: workerData.dataPoints, min: workerData.min, max: workerData.max, average: workerData.average});
</del><ins>+                layoutView(workerView, "usage", CPUTimelineView.threadCPUUsageViewHeight, this._threadLayoutMax, {dataPoints: workerData.dataPoints, min: workerData.min, max: workerData.max, average: workerData.average});
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -1703,9 +1713,7 @@
</span><span class="cx">         this._overlayRecord = record;
</span><span class="cx">         this._overlayTime = time;
</span><span class="cx"> 
</span><del>-        let layoutMax = this._layoutMax;
</del><span class="cx">         let secondsPerPixel = this._secondsPerPixelInLayout;
</span><del>-        let graphMax = layoutMax * 1.05;
</del><span class="cx">         let graphStartTime = this.startTime;
</span><span class="cx"> 
</span><span class="cx">         this._overlayMarker.time = time + (secondsPerPixel / 2);
</span><span class="lines">@@ -1718,10 +1726,12 @@
</span><span class="cx"> 
</span><span class="cx">         let {mainThreadUsage, workerThreadUsage, webkitThreadUsage, unknownThreadUsage, workersData} = record;
</span><span class="cx"> 
</span><del>-        function addOverlayPoint(view, graphHeight, value) {
</del><ins>+        function addOverlayPoint(view, graphHeight, layoutMax, value) {
</ins><span class="cx">             if (!value)
</span><span class="cx">                 return;
</span><span class="cx"> 
</span><ins>+            let graphMax = layoutMax * 1.05;
+
</ins><span class="cx">             function yScale(value) {
</span><span class="cx">                 return graphHeight - ((value / graphMax) * graphHeight);
</span><span class="cx">             }
</span><span class="lines">@@ -1733,19 +1743,19 @@
</span><span class="cx">         this._clearOverlayMarkers();
</span><span class="cx"> 
</span><span class="cx">         this._cpuUsageView.updateLegend(record);
</span><del>-        addOverlayPoint(this._cpuUsageView, CPUTimelineView.cpuUsageViewHeight, mainThreadUsage);
-        addOverlayPoint(this._cpuUsageView, CPUTimelineView.cpuUsageViewHeight, mainThreadUsage + workerThreadUsage);
-        addOverlayPoint(this._cpuUsageView, CPUTimelineView.cpuUsageViewHeight, mainThreadUsage + workerThreadUsage + webkitThreadUsage + unknownThreadUsage);
</del><ins>+        addOverlayPoint(this._cpuUsageView, CPUTimelineView.cpuUsageViewHeight, this._layoutMax, mainThreadUsage);
+        addOverlayPoint(this._cpuUsageView, CPUTimelineView.cpuUsageViewHeight, this._layoutMax, mainThreadUsage + workerThreadUsage);
+        addOverlayPoint(this._cpuUsageView, CPUTimelineView.cpuUsageViewHeight, this._layoutMax, mainThreadUsage + workerThreadUsage + webkitThreadUsage + unknownThreadUsage);
</ins><span class="cx"> 
</span><span class="cx">         if (this._threadsDetailsElement.open) {
</span><span class="cx">             this._mainThreadUsageView.updateLegend(mainThreadUsage);
</span><del>-            addOverlayPoint(this._mainThreadUsageView, CPUTimelineView.threadCPUUsageViewHeight, mainThreadUsage);
</del><ins>+            addOverlayPoint(this._mainThreadUsageView, CPUTimelineView.threadCPUUsageViewHeight, this._threadLayoutMax, mainThreadUsage);
</ins><span class="cx"> 
</span><span class="cx">             this._webkitThreadUsageView.updateLegend(webkitThreadUsage);
</span><del>-            addOverlayPoint(this._webkitThreadUsageView, CPUTimelineView.threadCPUUsageViewHeight, webkitThreadUsage);
</del><ins>+            addOverlayPoint(this._webkitThreadUsageView, CPUTimelineView.threadCPUUsageViewHeight, this._threadLayoutMax, webkitThreadUsage);
</ins><span class="cx"> 
</span><span class="cx">             this._unknownThreadUsageView.updateLegend(unknownThreadUsage);
</span><del>-            addOverlayPoint(this._unknownThreadUsageView, CPUTimelineView.threadCPUUsageViewHeight, unknownThreadUsage);
</del><ins>+            addOverlayPoint(this._unknownThreadUsageView, CPUTimelineView.threadCPUUsageViewHeight, this._threadLayoutMax, unknownThreadUsage);
</ins><span class="cx"> 
</span><span class="cx">             for (let workerView of this._workerViews)
</span><span class="cx">                 workerView.updateLegend(NaN);
</span><span class="lines">@@ -1755,7 +1765,7 @@
</span><span class="cx">                     let workerView = this._workerViews.find((x) => x.__workerId === targetId);
</span><span class="cx">                     if (workerView) {
</span><span class="cx">                         workerView.updateLegend(usage);
</span><del>-                        addOverlayPoint(workerView, CPUTimelineView.threadCPUUsageViewHeight, usage);
</del><ins>+                        addOverlayPoint(workerView, CPUTimelineView.threadCPUUsageViewHeight, this._threadLayoutMax, usage);
</ins><span class="cx">                     }
</span><span class="cx">                 }
</span><span class="cx">             }
</span></span></pre>
</div>
</div>

</body>
</html>