Diff
Modified: trunk/PerformanceTests/Animation/balls.html (124701 => 124702)
--- trunk/PerformanceTests/Animation/balls.html 2012-08-04 17:52:35 UTC (rev 124701)
+++ trunk/PerformanceTests/Animation/balls.html 2012-08-04 21:12:36 UTC (rev 124702)
@@ -258,8 +258,8 @@
PerfTestRunner.log("<br>===================================================<br>");
init();
}
- else if (window.layoutTestController)
- layoutTestController.notifyDone();
+ else if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
<script src=""
Modified: trunk/PerformanceTests/ChangeLog (124701 => 124702)
--- trunk/PerformanceTests/ChangeLog 2012-08-04 17:52:35 UTC (rev 124701)
+++ trunk/PerformanceTests/ChangeLog 2012-08-04 21:12:36 UTC (rev 124702)
@@ -1,3 +1,20 @@
+2012-08-04 Ryosuke Niwa <[email protected]>
+
+ Use testRunner instead of layoutTestController in performance tests
+ https://bugs.webkit.org/show_bug.cgi?id=93184
+
+ Reviewed by Adam Barth.
+
+ * Animation/balls.html:
+ * Dromaeo/resources/dromaeorunner.js:
+ * inspector/console-300-lines.html:
+ * inspector/inspector-startup-time.html:
+ * inspector/network-append-30-requests.html.broken:
+ * inspector/show-panel.html.broken:
+ * resources/runner.js:
+ (PerfTestRunner.logInfo):
+ (PerfTestRunner.initAndStartLoop):
+
2012-08-02 Arnaud Renevier <[email protected]>
TypedArray set method is slow when called with another typed array
Modified: trunk/PerformanceTests/Dromaeo/resources/dromaeorunner.js (124701 => 124702)
--- trunk/PerformanceTests/Dromaeo/resources/dromaeorunner.js 2012-08-04 17:52:35 UTC (rev 124701)
+++ trunk/PerformanceTests/Dromaeo/resources/dromaeorunner.js 2012-08-04 21:12:36 UTC (rev 124702)
@@ -64,8 +64,8 @@
var scores = DRT.computeScores(data.result);
PerfTestRunner.printStatistics(scores);
window.setTimeout(function() {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 0);
},
Modified: trunk/PerformanceTests/inspector/console-300-lines.html (124701 => 124702)
--- trunk/PerformanceTests/inspector/console-300-lines.html 2012-08-04 17:52:35 UTC (rev 124701)
+++ trunk/PerformanceTests/inspector/console-300-lines.html 2012-08-04 21:12:36 UTC (rev 124702)
@@ -66,7 +66,7 @@
InspectorTest.runPerformanceTest(test, 10000);
}
-if (!window.layoutTestController) {
+if (!window.testRunner) {
setTimeout(function() {
makeConsoleEvents(300);
}, 3000);
Modified: trunk/PerformanceTests/inspector/inspector-startup-time.html (124701 => 124702)
--- trunk/PerformanceTests/inspector/inspector-startup-time.html 2012-08-04 17:52:35 UTC (rev 124701)
+++ trunk/PerformanceTests/inspector/inspector-startup-time.html 2012-08-04 21:12:36 UTC (rev 124702)
@@ -7,7 +7,7 @@
function onload()
{
- layoutTestController.waitUntilDone();
+ testRunner.waitUntilDone();
times = [];
startTime = Date.now();
testStartTime = startTime;
@@ -18,13 +18,13 @@
{
times.push(Date.now() - startTime);
if (Date.now() - testStartTime > 20000) {
- layoutTestController.evaluateInWebInspector(2, "InspectorTest.dumpTestStats('inspector-startup-time', 'time', " + JSON.stringify(times) + ", 'ms')")
- layoutTestController.evaluateInWebInspector(3, "(InspectorTest.completeTest())")
+ testRunner.evaluateInWebInspector(2, "InspectorTest.dumpTestStats('inspector-startup-time', 'time', " + JSON.stringify(times) + ", 'ms')")
+ testRunner.evaluateInWebInspector(3, "(InspectorTest.completeTest())")
return;
}
- layoutTestController.closeWebInspector();
+ testRunner.closeWebInspector();
startTime = Date.now();
- layoutTestController.showWebInspector();
+ testRunner.showWebInspector();
runTest();
}
Modified: trunk/PerformanceTests/inspector/network-append-30-requests.html.broken (124701 => 124702)
--- trunk/PerformanceTests/inspector/network-append-30-requests.html.broken 2012-08-04 17:52:35 UTC (rev 124701)
+++ trunk/PerformanceTests/inspector/network-append-30-requests.html.broken 2012-08-04 21:12:36 UTC (rev 124702)
@@ -38,7 +38,7 @@
InspectorTest.runPerformanceTest(test, 15000);
}
-if (!window.layoutTestController) {
+if (!window.testRunner) {
setTimeout(function() {
makeXHRRequests(30);
}, 3000);
Modified: trunk/PerformanceTests/inspector/show-panel.html.broken (124701 => 124702)
--- trunk/PerformanceTests/inspector/show-panel.html.broken 2012-08-04 17:52:35 UTC (rev 124701)
+++ trunk/PerformanceTests/inspector/show-panel.html.broken 2012-08-04 21:12:36 UTC (rev 124702)
@@ -42,7 +42,7 @@
for (var panelName in WebInspector.panels) {
var timerCookie = timer.start("show-panel-" + panelName);
WebInspector.showPanel(panelName);
- InspectorTest.evaluateInPage("layoutTestController.display();");
+ InspectorTest.evaluateInPage("testRunner.display();");
timer.finish(timerCookie);
}
timer.done("panel-switch");
Modified: trunk/PerformanceTests/resources/runner.js (124701 => 124702)
--- trunk/PerformanceTests/resources/runner.js 2012-08-04 17:52:35 UTC (rev 124701)
+++ trunk/PerformanceTests/resources/runner.js 2012-08-04 21:12:36 UTC (rev 124702)
@@ -42,7 +42,7 @@
}
PerfTestRunner.logInfo = function (text) {
- if (!window.layoutTestController)
+ if (!window.testRunner)
this.log(text);
}
@@ -131,8 +131,8 @@
logLines.forEach(function(text) { self.log(text); });
}
this._doneFunction();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
@@ -172,7 +172,7 @@
this._completedRuns = -1;
this.customRunFunction = null;
this._results = [];
- this._logLines = window.layoutTestController ? [] : null;
+ this._logLines = window.testRunner ? [] : null;
this.log("Running " + this._runCount + " times");
this._runLoop();
}
@@ -227,7 +227,7 @@
return Date.now() - startTime;
}
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
}
