Bug 1182595 - Make ts_paint talos test use new TalosContentProfiler utility. r?jmaher
MozReview-Commit-ID: 9uM5imXZkdZ
--- a/testing/talos/talos/startup_test/tspaint_test.html
+++ b/testing/talos/talos/startup_test/tspaint_test.html
@@ -2,46 +2,44 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
<html>
<meta charset="utf-8">
<!-- Pick off begin time as a cgi argument and print it out -->
<!-- call this with an arg, e.g. file://foo/startup-test.html?begin=12345678 -->
<!-- In-line this to avoid compilation. -->
<script language="Javascript" type="text/javascript" src="../scripts/MozillaFileLogger.js"></script>
-<script language="Javascript" type="text/javascript" src="../scripts/Profiler.js"></script>
+<script language="JavaScript" type="text/javascript" src="chrome://talos-powers-content/content/TalosContentProfiler.js"></script>
<script language="JavaScript" type="text/javascript" src="../tests/quit.js"></script>
<script language="javascript" type="text/javascript">
function painted() {
var now = Date.now();
- Profiler.pause();
- Profiler.initFromURLQueryParams(location.search);
- Profiler.finishStartupProfiling();
-
window.removeEventListener("MozAfterPaint", painted, true);
- var startupTime = -1;
+ TalosContentProfiler.initFromURLQueryParams(location.search);
+
+ TalosContentProfiler.finishStartupProfiling().then(() => {
+ var startupTime = -1;
- try {
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
- var startupInfo = Components.classes['@mozilla.org/toolkit/app-startup;1'].
- getService(Ci.nsIAppStartup).getStartupInfo();
- startupTime = now - startupInfo['process'];
- } catch(ex) {
- dumpLog(ex + '\n');
- }
+ try {
+ netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+ var startupInfo = Components.classes['@mozilla.org/toolkit/app-startup;1'].
+ getService(Ci.nsIAppStartup).getStartupInfo();
+ startupTime = now - startupInfo['process'];
+ } catch(ex) {
+ dumpLog(ex + '\n');
+ }
- Profiler.pause();
-
- document.body.textContent = 'Startup time = ' + startupTime + ' ms';
- if (window.dump) {
- dumpLog('__start_report' + startupTime + '__end_report\n\n');
- }
- dumpConsoleAndQuit();
+ document.body.textContent = 'Startup time = ' + startupTime + ' ms';
+ if (window.dump) {
+ dumpLog('__start_report' + startupTime + '__end_report\n\n');
+ }
+ dumpConsoleAndQuit();
+ });
}
function failed() {
if (window.dump) {
dumpLog('BROWSER FAILED TO GENERATE MOZAFTERPAINT IN 5 SECONDS');
}
dumpConsoleAndQuit();
}