<!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>[197723] trunk/PerformanceTests</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/197723">197723</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2016-03-07 19:45:49 -0800 (Mon, 07 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add ability to retrieve raw data from release harness
https://bugs.webkit.org/show_bug.cgi?id=155026

Reviewed by Simon Fraser.

* Animometer/developer.html: Remove the special UI in the debug
harness.
* Animometer/resources/runner/animometer.css: Add styles for the
overlay.
* Animometer/resources/runner/animometer.js: Let 'j' show the JSON
results, but only if the overlay doesn't exist. Add 'esc' key to dismiss
the overlay.
(window.benchmarkController.selectResults): Cycle the cases around
so that the first 's' press selects both the benchmark score and
the individual test scores.
* Animometer/resources/debug-runner/animometer.css: Remove
unneeded rules.
* Animometer/resources/debug-runner/animometer.js: Make the same
call to handleKeyPress.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsAnimometerdeveloperhtml">trunk/PerformanceTests/Animometer/developer.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometerresourcesdebugrunneranimometercss">trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.css</a></li>
<li><a href="#trunkPerformanceTestsAnimometerresourcesdebugrunneranimometerjs">trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometerresourcesrunneranimometercss">trunk/PerformanceTests/Animometer/resources/runner/animometer.css</a></li>
<li><a href="#trunkPerformanceTestsAnimometerresourcesrunneranimometerjs">trunk/PerformanceTests/Animometer/resources/runner/animometer.js</a></li>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsAnimometerdeveloperhtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/developer.html (197722 => 197723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/developer.html        2016-03-08 03:01:00 UTC (rev 197722)
+++ trunk/PerformanceTests/Animometer/developer.html        2016-03-08 03:45:49 UTC (rev 197723)
</span><span class="lines">@@ -93,15 +93,11 @@
</span><span class="cx">                 &lt;/div&gt;
</span><span class="cx">                 &lt;table id=&quot;results-header&quot;&gt;&lt;/table&gt;
</span><span class="cx">             &lt;/div&gt;
</span><del>-            &lt;div id=&quot;results-json&quot;&gt;
-                &lt;button class=&quot;small-button&quot; onclick=&quot;benchmarkController.showJSONResults()&quot;&gt;JSON results&lt;/button&gt;
-                &lt;div class=&quot;hidden&quot;&gt;
-                    JSON:
-                    &lt;textarea rows=1 onclick=&quot;this.focus();this.select()&quot; readonly&gt;&lt;/textarea&gt;
-                &lt;/div&gt;
-            &lt;/div&gt;
</del><span class="cx">             &lt;button onclick=&quot;benchmarkController.startBenchmark()&quot;&gt;Test Again&lt;/button&gt;
</span><del>-            &lt;p&gt;'s': Select different data for copy/paste&lt;/p&gt;
</del><ins>+            &lt;p&gt;
+                'j': Show JSON results&lt;br/&gt;
+                's': Select various results for copy/paste (use repeatedly to cycle)
+            &lt;/p&gt;
</ins><span class="cx">         &lt;/section&gt;
</span><span class="cx">         &lt;section id=&quot;test-graph&quot;&gt;
</span><span class="cx">             &lt;header&gt;
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerresourcesdebugrunneranimometercss"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.css (197722 => 197723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.css        2016-03-08 03:01:00 UTC (rev 197722)
+++ trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.css        2016-03-08 03:45:49 UTC (rev 197723)
</span><span class="lines">@@ -353,14 +353,6 @@
</span><span class="cx">     flex-direction: row;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#results-json {
-    margin-bottom: 3em;
-}
-
-#results-json textarea {
-    vertical-align: sub;
-}
-
</del><span class="cx"> #test-graph {
</span><span class="cx">     flex: 1 0 calc(100% - 40px);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerresourcesdebugrunneranimometerjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.js (197722 => 197723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.js        2016-03-08 03:01:00 UTC (rev 197722)
+++ trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.js        2016-03-08 03:45:49 UTC (rev 197723)
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx">     showResults: function()
</span><span class="cx">     {
</span><span class="cx">         if (!this.addedKeyEvent) {
</span><del>-            document.addEventListener(&quot;keypress&quot;, this.selectResults, false);
</del><ins>+            document.addEventListener(&quot;keypress&quot;, this.handleKeyPress, false);
</ins><span class="cx">             this.addedKeyEvent = true;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -511,17 +511,6 @@
</span><span class="cx">         suitesManager.updateLocalStorageFromJSON(dashboard.results[0]);
</span><span class="cx">     },
</span><span class="cx"> 
</span><del>-    showJSONResults: function()
-    {
-        var output = {
-            options: benchmarkRunnerClient.results.options,
-            data: benchmarkRunnerClient.results.data
-        };
-        var textarea = document.querySelector(&quot;#results-json textarea&quot;).textContent = JSON.stringify(output, null, 1);
-        document.querySelector(&quot;#results-json button&quot;).remove();
-        document.querySelector(&quot;#results-json div&quot;).classList.remove(&quot;hidden&quot;);
-    },
-
</del><span class="cx">     showTestGraph: function(testName, testResult, testData)
</span><span class="cx">     {
</span><span class="cx">         sectionsManager.setSectionHeader(&quot;test-graph&quot;, testName);
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerresourcesrunneranimometercss"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/resources/runner/animometer.css (197722 => 197723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/runner/animometer.css        2016-03-08 03:01:00 UTC (rev 197722)
+++ trunk/PerformanceTests/Animometer/resources/runner/animometer.css        2016-03-08 03:45:49 UTC (rev 197723)
</span><span class="lines">@@ -240,3 +240,55 @@
</span><span class="cx">         font-size: 3em;
</span><span class="cx">     }
</span><span class="cx"> }
</span><ins>+
+#overlay {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    color: rgb(255, 255, 255);
+    background: rgba(0, 0, 10, .8);
+}
+
+@supports (-webkit-backdrop-filter: blur(10px)) {
+    #overlay {
+        background: rgba(0, 0, 10, .4);
+        -webkit-backdrop-filter: blur(10px);
+    }
+}
+
+#overlay &gt; div {
+    width: 500px;
+    height: 500px;
+    position: absolute;
+    margin-top: -250px;
+    margin-left: -250px;
+    top: 50%;
+    left: 50%;
+    display: flex;
+    justify-content: flex-start;
+    flex-flow: column;
+}
+
+#overlay &gt; div div {
+    flex: 1 1 auto;
+    overflow: scroll;
+    border: 1px solid rgb(241, 241, 241);
+    padding: 2px;
+    box-sizing: border-box;
+}
+
+#overlay button {
+    margin: 1em 5em;
+    border-color: rgb(241, 241, 241);
+    color: rgb(241, 241, 241);
+}
+
+#overlay button:hover {
+    background-color: rgba(255, 255, 255, .1);
+}
+
+#overlay button:active {
+    background-color: rgba(255, 255, 255, .2);
+}
</ins></span></pre></div>
<a id="trunkPerformanceTestsAnimometerresourcesrunneranimometerjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/resources/runner/animometer.js (197722 => 197723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/runner/animometer.js        2016-03-08 03:01:00 UTC (rev 197722)
+++ trunk/PerformanceTests/Animometer/resources/runner/animometer.js        2016-03-08 03:45:49 UTC (rev 197723)
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx">     showResults: function()
</span><span class="cx">     {
</span><span class="cx">         if (!this.addedKeyEvent) {
</span><del>-            document.addEventListener(&quot;keypress&quot;, this.selectResults, false);
</del><ins>+            document.addEventListener(&quot;keypress&quot;, this.handleKeyPress, false);
</ins><span class="cx">             this.addedKeyEvent = true;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -393,28 +393,86 @@
</span><span class="cx">         sectionsManager.showSection(&quot;results&quot;, true);
</span><span class="cx">     },
</span><span class="cx"> 
</span><del>-    selectResults: function(event)
</del><ins>+    handleKeyPress: function(event)
</ins><span class="cx">     {
</span><del>-        if (event.charCode != 115) // 's'
</del><ins>+        switch (event.charCode)
+        {
+        case 27:  // esc
+            benchmarkController.hideDebugInfo();
+            break;
+        case 106: // j
+            benchmarkController.showDebugInfo();
+            break;
+        case 115: // s
+            benchmarkController.selectResults(event.target);
+            break;
+        }
+    },
+
+    hideDebugInfo: function()
+    {
+        var overlay = document.getElementById(&quot;overlay&quot;);
+        if (!overlay)
</ins><span class="cx">             return;
</span><ins>+        document.body.removeChild(overlay);
+    },
</ins><span class="cx"> 
</span><del>-        event.target.selectRange = ((event.target.selectRange || 0) + 1) % 3;
</del><ins>+    showDebugInfo: function()
+    {
+        if (document.getElementById(&quot;overlay&quot;))
+            return;
</ins><span class="cx"> 
</span><ins>+        var overlay = Utilities.createElement(&quot;div&quot;, {
+            id: &quot;overlay&quot;
+        }, document.body);
+        var container = Utilities.createElement(&quot;div&quot;, {}, overlay);
+
+        var header = Utilities.createElement(&quot;h3&quot;, {}, container);
+        header.textContent = &quot;Debug output&quot;;
+
+        var data = Utilities.createElement(&quot;div&quot;, {}, container);
+        data.textContent = &quot;Please wait...&quot;;
+        setTimeout(function() {
+            var output = {
+                options: benchmarkRunnerClient.results.options,
+                data: benchmarkRunnerClient.results.data
+            };
+            data.textContent = JSON.stringify(output, null, 1);
+        }, 0);
+        data.onclick = function() {
+            var selection = window.getSelection();
+            selection.removeAllRanges();
+            var range = document.createRange();
+            range.selectNode(data);
+            selection.addRange(range);
+        };
+
+        var button = Utilities.createElement(&quot;button&quot;, {}, container);
+        button.textContent = &quot;Done&quot;;
+        button.onclick = function() {
+            benchmarkController.hideDebugInfo();
+        };
+    },
+
+    selectResults: function(target)
+    {
+        target.selectRange = ((target.selectRange || 0) + 1) % 3;
+
</ins><span class="cx">         var selection = window.getSelection();
</span><span class="cx">         selection.removeAllRanges();
</span><span class="cx">         var range = document.createRange();
</span><del>-        switch (event.target.selectRange) {
</del><ins>+        switch (target.selectRange) {
</ins><span class="cx">             case 0: {
</span><del>-                range.setStart(document.querySelector(&quot;#results .score&quot;), 0);
-                range.setEndAfter(document.querySelector(&quot;#results-score &gt; tr:last-of-type&quot;), 0);
</del><ins>+                range.selectNode(document.getElementById(&quot;results-score&quot;));
</ins><span class="cx">                 break;
</span><span class="cx">             }
</span><span class="cx">             case 1: {
</span><del>-                range.selectNodeContents(document.querySelector(&quot;#results .score&quot;));
</del><ins>+                range.setStart(document.querySelector(&quot;#results .score&quot;), 0);
+                range.setEndAfter(document.querySelector(&quot;#results-score &gt; tr:last-of-type&quot;), 0);
</ins><span class="cx">                 break;
</span><span class="cx">             }
</span><span class="cx">             case 2: {
</span><del>-                range.selectNode(document.getElementById(&quot;results-score&quot;));
</del><ins>+                range.selectNodeContents(document.querySelector(&quot;#results .score&quot;));
</ins><span class="cx">                 break;
</span><span class="cx">             }
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (197722 => 197723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog        2016-03-08 03:01:00 UTC (rev 197722)
+++ trunk/PerformanceTests/ChangeLog        2016-03-08 03:45:49 UTC (rev 197723)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2016-03-03  Jon Lee  &lt;jonlee@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Add ability to retrieve raw data from release harness
+        https://bugs.webkit.org/show_bug.cgi?id=155026
+
+        Reviewed by Simon Fraser.
+
+        * Animometer/developer.html: Remove the special UI in the debug
+        harness.
+        * Animometer/resources/runner/animometer.css: Add styles for the
+        overlay.
+        * Animometer/resources/runner/animometer.js: Let 'j' show the JSON
+        results, but only if the overlay doesn't exist. Add 'esc' key to dismiss
+        the overlay.
+        (window.benchmarkController.selectResults): Cycle the cases around
+        so that the first 's' press selects both the benchmark score and
+        the individual test scores.
+        * Animometer/resources/debug-runner/animometer.css: Remove
+        unneeded rules.
+        * Animometer/resources/debug-runner/animometer.js: Make the same
+        call to handleKeyPress.
+
+2016-03-03  Jon Lee  &lt;jonlee@apple.com&gt;
+
</ins><span class="cx">         Make sure multiply test particles have at least some opacity
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=155027
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>