Diff
Modified: trunk/PerformanceTests/Animometer/developer.html (197722 => 197723)
--- 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)
@@ -93,15 +93,11 @@
</div>
<table id="results-header"></table>
</div>
- <div id="results-json">
- <button class="small-button" _onclick_="benchmarkController.showJSONResults()">JSON results</button>
- <div class="hidden">
- JSON:
- <textarea rows=1 _onclick_="this.focus();this.select()" readonly></textarea>
- </div>
- </div>
<button _onclick_="benchmarkController.startBenchmark()">Test Again</button>
- <p>'s': Select different data for copy/paste</p>
+ <p>
+ 'j': Show JSON results<br/>
+ 's': Select various results for copy/paste (use repeatedly to cycle)
+ </p>
</section>
<section id="test-graph">
<header>
Modified: trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.css (197722 => 197723)
--- 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)
@@ -353,14 +353,6 @@
flex-direction: row;
}
-#results-json {
- margin-bottom: 3em;
-}
-
-#results-json textarea {
- vertical-align: sub;
-}
-
#test-graph {
flex: 1 0 calc(100% - 40px);
}
Modified: trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.js (197722 => 197723)
--- 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)
@@ -490,7 +490,7 @@
showResults: function()
{
if (!this.addedKeyEvent) {
- document.addEventListener("keypress", this.selectResults, false);
+ document.addEventListener("keypress", this.handleKeyPress, false);
this.addedKeyEvent = true;
}
@@ -511,17 +511,6 @@
suitesManager.updateLocalStorageFromJSON(dashboard.results[0]);
},
- showJSONResults: function()
- {
- var output = {
- options: benchmarkRunnerClient.results.options,
- data: benchmarkRunnerClient.results.data
- };
- var textarea = document.querySelector("#results-json textarea").textContent = JSON.stringify(output, null, 1);
- document.querySelector("#results-json button").remove();
- document.querySelector("#results-json div").classList.remove("hidden");
- },
-
showTestGraph: function(testName, testResult, testData)
{
sectionsManager.setSectionHeader("test-graph", testName);
Modified: trunk/PerformanceTests/Animometer/resources/runner/animometer.css (197722 => 197723)
--- 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)
@@ -240,3 +240,55 @@
font-size: 3em;
}
}
+
+#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 > 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 > 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);
+}
Modified: trunk/PerformanceTests/Animometer/resources/runner/animometer.js (197722 => 197723)
--- 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)
@@ -381,7 +381,7 @@
showResults: function()
{
if (!this.addedKeyEvent) {
- document.addEventListener("keypress", this.selectResults, false);
+ document.addEventListener("keypress", this.handleKeyPress, false);
this.addedKeyEvent = true;
}
@@ -393,28 +393,86 @@
sectionsManager.showSection("results", true);
},
- selectResults: function(event)
+ handleKeyPress: function(event)
{
- if (event.charCode != 115) // 's'
+ 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("overlay");
+ if (!overlay)
return;
+ document.body.removeChild(overlay);
+ },
- event.target.selectRange = ((event.target.selectRange || 0) + 1) % 3;
+ showDebugInfo: function()
+ {
+ if (document.getElementById("overlay"))
+ return;
+ var overlay = Utilities.createElement("div", {
+ id: "overlay"
+ }, document.body);
+ var container = Utilities.createElement("div", {}, overlay);
+
+ var header = Utilities.createElement("h3", {}, container);
+ header.textContent = "Debug output";
+
+ var data = "" {}, container);
+ data.textContent = "Please wait...";
+ 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("button", {}, container);
+ button.textContent = "Done";
+ button._onclick_ = function() {
+ benchmarkController.hideDebugInfo();
+ };
+ },
+
+ selectResults: function(target)
+ {
+ target.selectRange = ((target.selectRange || 0) + 1) % 3;
+
var selection = window.getSelection();
selection.removeAllRanges();
var range = document.createRange();
- switch (event.target.selectRange) {
+ switch (target.selectRange) {
case 0: {
- range.setStart(document.querySelector("#results .score"), 0);
- range.setEndAfter(document.querySelector("#results-score > tr:last-of-type"), 0);
+ range.selectNode(document.getElementById("results-score"));
break;
}
case 1: {
- range.selectNodeContents(document.querySelector("#results .score"));
+ range.setStart(document.querySelector("#results .score"), 0);
+ range.setEndAfter(document.querySelector("#results-score > tr:last-of-type"), 0);
break;
}
case 2: {
- range.selectNode(document.getElementById("results-score"));
+ range.selectNodeContents(document.querySelector("#results .score"));
break;
}
}
Modified: trunk/PerformanceTests/ChangeLog (197722 => 197723)
--- trunk/PerformanceTests/ChangeLog 2016-03-08 03:01:00 UTC (rev 197722)
+++ trunk/PerformanceTests/ChangeLog 2016-03-08 03:45:49 UTC (rev 197723)
@@ -1,5 +1,27 @@
2016-03-03 Jon Lee <[email protected]>
+ 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 <[email protected]>
+
Make sure multiply test particles have at least some opacity
https://bugs.webkit.org/show_bug.cgi?id=155027
