<!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>[200818] trunk/Websites/perf.webkit.org</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/200818">200818</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-13 00:31:58 -0700 (Fri, 13 May 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Show a spinner while fetching data on summary page
https://bugs.webkit.org/show_bug.cgi?id=157658

Reviewed by Darin Adler.

Show a spinner while fetching JSON files on the summary page.

* public/v3/components/base.js:
(ComponentBase.prototype.renderReplace): Added a new implementation that simply calls the static version.
(ComponentBase.renderReplace): Made this static.

* public/v3/pages/summary-page.js:
(SummaryPage.prototype._constructRatioGraph): Show a spinner icon when SummaryPageConfigurationGroup's
isFetching returns true.
(SummaryPage.cssTemplate): Force the height of each cell to be 2.5rem so that the height of cell doesn't
change when a spinner is replaced by a ratio bar graph.

(SummaryPageConfigurationGroup): Added this._isFetching as an instance variable.
(SummaryPageConfigurationGroup.prototype.isFetching): Added.
(SummaryPageConfigurationGroup.prototype.fetchAndComputeSummary): Set this._isFetching while waiting for
the promises to resolve after 50ms. We don't immediately set this._isFetching to avoid FOC when all JSON
files have been cached.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3componentsbasejs">trunk/Websites/perf.webkit.org/public/v3/components/base.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3pagessummarypagejs">trunk/Websites/perf.webkit.org/public/v3/pages/summary-page.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (200817 => 200818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog        2016-05-13 06:38:13 UTC (rev 200817)
+++ trunk/Websites/perf.webkit.org/ChangeLog        2016-05-13 07:31:58 UTC (rev 200818)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-05-13  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
+        Show a spinner while fetching data on summary page
+        https://bugs.webkit.org/show_bug.cgi?id=157658
+
+        Reviewed by Darin Adler.
+
+        Show a spinner while fetching JSON files on the summary page.
+
+        * public/v3/components/base.js:
+        (ComponentBase.prototype.renderReplace): Added a new implementation that simply calls the static version.
+        (ComponentBase.renderReplace): Made this static.
+
+        * public/v3/pages/summary-page.js:
+        (SummaryPage.prototype._constructRatioGraph): Show a spinner icon when SummaryPageConfigurationGroup's
+        isFetching returns true.
+        (SummaryPage.cssTemplate): Force the height of each cell to be 2.5rem so that the height of cell doesn't
+        change when a spinner is replaced by a ratio bar graph.
+
+        (SummaryPageConfigurationGroup): Added this._isFetching as an instance variable.
+        (SummaryPageConfigurationGroup.prototype.isFetching): Added.
+        (SummaryPageConfigurationGroup.prototype.fetchAndComputeSummary): Set this._isFetching while waiting for
+        the promises to resolve after 50ms. We don't immediately set this._isFetching to avoid FOC when all JSON
+        files have been cached.
+
</ins><span class="cx"> 2016-05-07  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Add horizontal between categories of tests
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3componentsbasejs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/components/base.js (200817 => 200818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/components/base.js        2016-05-13 06:38:13 UTC (rev 200817)
+++ trunk/Websites/perf.webkit.org/public/v3/components/base.js        2016-05-13 07:31:58 UTC (rev 200818)
</span><span class="lines">@@ -12,7 +12,9 @@
</span><span class="cx">     content() { return this._shadow; }
</span><span class="cx">     render() { }
</span><span class="cx"> 
</span><del>-    renderReplace(element, content)
</del><ins>+    renderReplace(element, content) { ComponentBase.renderReplace(element, content); }
+
+    static renderReplace(element, content)
</ins><span class="cx">     {
</span><span class="cx">         element.innerHTML = '';
</span><span class="cx">         if (content)
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3pagessummarypagejs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/pages/summary-page.js (200817 => 200818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/pages/summary-page.js        2016-05-13 06:38:13 UTC (rev 200817)
+++ trunk/Websites/perf.webkit.org/public/v3/pages/summary-page.js        2016-05-13 07:31:58 UTC (rev 200818)
</span><span class="lines">@@ -94,8 +94,20 @@
</span><span class="cx">         var ratioGraph = new RatioBarGraph();
</span><span class="cx"> 
</span><span class="cx">         var state = ChartsPage.createStateForConfigurationList(configurationList);
</span><del>-        var anchor = link(ratioGraph, this.router().url('charts', state));
</del><ins>+
+        if (configurationList.length == 0) {
+            this._renderQueue.push(function () { ratioGraph.render(); });
+            return element('td', ratioGraph);
+        }
+
+        var cell = element('td');
+        var url = this.router().url('charts', state);
</ins><span class="cx">         this._renderQueue.push(function () {
</span><ins>+            if (configurationGroup.isFetching()) {
+                ComponentBase.renderReplace(cell, new SpinnerIcon);
+                return;
+            }
+
</ins><span class="cx">             var warnings = configurationGroup.warnings();
</span><span class="cx">             var warningText = '';
</span><span class="cx">             for (var type in warnings) {
</span><span class="lines">@@ -103,14 +115,13 @@
</span><span class="cx">                 warningText += `Missing ${type} for following platform(s): ${platformString}`;
</span><span class="cx">             }
</span><span class="cx"> 
</span><del>-            anchor.title = warningText || 'Open charts';
</del><ins>+            ComponentBase.renderReplace(cell, link(ratioGraph, warningText || 'Open charts', url));
+
</ins><span class="cx">             ratioGraph.update(configurationGroup.ratio(), configurationGroup.label(), !!warningText);
</span><span class="cx">             ratioGraph.render();
</span><span class="cx">         });
</span><del>-        if (configurationList.length == 0)
-            return element('td', ratioGraph);
</del><span class="cx"> 
</span><del>-        return element('td', anchor);
</del><ins>+        return cell;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     static htmlTemplate()
</span><span class="lines">@@ -167,14 +178,24 @@
</span><span class="cx">             }
</span><span class="cx"> 
</span><span class="cx">             .summary-table tbody td {
</span><ins>+                position: relative;
</ins><span class="cx">                 font-weight: inherit;
</span><span class="cx">                 font-size: 0.9rem;
</span><ins>+                height: 2.5rem;
</ins><span class="cx">                 padding: 0;
</span><span class="cx">             }
</span><span class="cx"> 
</span><span class="cx">             .summary-table td &gt; * {
</span><span class="cx">                 height: 100%;
</span><span class="cx">             }
</span><ins>+
+            .summary-table td spinner-icon {
+                display: block;
+                position: absolute;
+                top: 0.25rem;
+                left: calc(50% - 1rem);
+                z-index: 100;
+            }
</ins><span class="cx">         `;
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="lines">@@ -188,6 +209,7 @@
</span><span class="cx">         this._ratio = null;
</span><span class="cx">         this._label = null;
</span><span class="cx">         this._warnings = {};
</span><ins>+        this._isFetching = false;
</ins><span class="cx">         this._smallerIsBetter = metrics.length ? metrics[0].isSmallerBetter() : null;
</span><span class="cx"> 
</span><span class="cx">         for (var platform of platforms) {
</span><span class="lines">@@ -212,6 +234,7 @@
</span><span class="cx">     warnings() { return this._warnings; }
</span><span class="cx">     changeType() { return this._changeType; }
</span><span class="cx">     configurationList() { return this._configurationList; }
</span><ins>+    isFetching() { return this._isFetching; }
</ins><span class="cx"> 
</span><span class="cx">     fetchAndComputeSummary(timeRange)
</span><span class="cx">     {
</span><span class="lines">@@ -223,7 +246,19 @@
</span><span class="cx">         for (var set of this._measurementSets)
</span><span class="cx">             promises.push(this._fetchAndComputeRatio(set, timeRange));
</span><span class="cx"> 
</span><del>-        return Promise.all(promises).then(this._computeSummary.bind(this));
</del><ins>+        var self = this;
+        var fetched = false;
+        setTimeout(function () {
+            // Don't set _isFetching to true if all promises were to resolve immediately (cached).
+            if (!fetched)
+                self._isFetching = true;
+        }, 50);
+
+        return Promise.all(promises).then(function () {
+            fetched = true;
+            self._isFetching = false;
+            self._computeSummary();
+        });
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     _computeSummary()
</span></span></pre>
</div>
</div>

</body>
</html>