config: chrome/pageloader.js comparison

comparison chrome/pageloader.js @ 200:31249cbe4f19

Bug 629691 - pageloader.xpi does not support e10s for Tp chrome testing. r=jmaher

author	Joel Maher <jmaher@mozilla.com>
date	Sun, 30 Jan 2011 10:21:05 -0500
parents	59d4f04497dd
children	bffb8b1b0948

comparison

equal deleted inserted replaced

-:eab9ffc922b1
+:31249cbe4f19
 var cycle;
 var report;
 var renderReport;
 var noisy = false;
 var timeout = -1;
+var delay = 250;
 var timeoutEvent = -1;
 var running = false;
 var forceCC = true;
 var content;
 if (args.width) winWidth = parseInt(args.width);
 if (args.height) winHeight = parseInt(args.height);
 if (args.filter) pageFilterRegexp = new RegExp(args.filter);
 if (args.noisy) noisy = true;
 if (args.timeout) timeout = parseInt(args.timeout);
+if (args.delay) delay = parseInt(args.delay);
 forceCC = !args.noForceCC;
 doRenderTest = args.doRender;
 if (forceCC &&
 !window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
 browserWindow.resizeTo(winWidth, winHeight);
 browserWindow.moveTo(0, 0);
 browserWindow.focus();
 content = browserWindow.getBrowser();
+// Load the frame script for e10s / IPC message support
+if (content.getAttribute("remote") == "true") {
+let contentScript = "data:,addEventListener('load', function(e) { " +
+"  if (e.originalTarget.defaultView == content) { " +
+"    sendAsyncMessage('PageLoader:Load', {}); " +
+"    content.wrappedJSObject.tpRecordTime = function(t) { sendAsyncMessage('PageLoader:RecordTime', { time: t }); } " +
+"  }" +
+"}, true);"
+content.messageManager.loadFrameScript(contentScript, false);
+}
 setTimeout(plLoadPage, 100);
 }, 500);
 };
 browserWindow.addEventListener('load', browserLoadFunc, true);
 } else {
 window.resizeTo(winWidth, winHeight);
 content = document.getElementById('contentPageloader');
-setTimeout(plLoadPage, 250);
+setTimeout(plLoadPage, delay);
 }
 } catch(e) {
 dumpLine(e);
 plStop(true);
 }
 return pages[pageIndex].flags;
 }
 // load the current page, start timing
 var removeLastAddedListener = null;
+var removeLastAddedMsgListener = null;
 function plLoadPage() {
 var pageName = pages[pageIndex].url.spec;
 if (removeLastAddedListener)
 removeLastAddedListener();
+if (removeLastAddedMsgListener)
+removeLastAddedMsgListener();
 if (plPageFlags() & TEST_DOES_OWN_TIMING) {
 // if the page does its own timing, use a capturing handler
 // to make sure that we can set up the function for content to call
 content.addEventListener('load', plLoadHandlerCapturing, true);
 removeLastAddedListener = function() {
 content.removeEventListener('load', plLoadHandler, true);
 };
 }
+// If the test browser is remote (e10s / IPC) we need to use messages to watch for page load
+if (content.getAttribute("remote") == "true") {
+content.messageManager.addMessageListener('PageLoader:Load', plLoadHandlerMessage);
+content.messageManager.addMessageListener('PageLoader:RecordTime', plRecordTimeMessage);
+removeLastAddedMsgListener = function() {
+content.messageManager.removeMessageListener('PageLoader:Load', plLoadHandlerMessage);
+content.messageManager.removeMessageListener('PageLoader:RecordTime', plRecordTimeMessage);
+};
+}
 if (timeout > 0) {
 timeoutEvent = setTimeout('loadFail()', timeout);
 }
 start_time = Date.now();
 content.loadURI(pageName);
 .garbageCollect();
 var tccend = new Date();
 report.recordCCTime(tccend - tccstart);
 }
-setTimeout(plLoadPage, 250);
+setTimeout(plLoadPage, delay);
 } else {
 plStop(false);
 }
 }
 }
 // set up the function for content to call
 content.contentWindow.wrappedJSObject.tpRecordTime = function (time) {
 plRecordTime(time);
-setTimeout(plNextPage, 250);
+setTimeout(plNextPage, delay);
 };
 }
 // the onload handler
 function plLoadHandler(evt) {
 runRenderTest();
 plNextPage();
 }
+// the onload handler used for remote (e10s) browser
+function plLoadHandlerMessage(message) {
+if (timeout > 0) {
+clearTimeout(timeoutEvent);
+}
+// does this page want to do its own timing?
+// if so, let's bail
+if (plPageFlags() & TEST_DOES_OWN_TIMING)
+return;
+var end_time = Date.now();
+var time = (end_time - start_time);
+plRecordTime(time);
+if (doRenderTest)
+runRenderTest();
+plNextPage();
+}
+// the record time handler used for remote (e10s) browser
+function plRecordTimeMessage(message) {
+plRecordTime(message.json.time);
+setTimeout(plNextPage, delay);
+}
 function runRenderTest() {
 const redrawsPerSample = 500;
 if (!Ci.nsIDOMWindowUtils)
 return;
 try {
 if (force == false) {
 pageIndex = 0;
 if (cycle < NUM_CYCLES-1) {
 cycle++;
-setTimeout(plLoadPage, 250);
+setTimeout(plLoadPage, delay);
 return;
 }
 var formats = reportFormat.split(",");
 }
 } catch (e) {
 dumpLine(e);
 }
-if (content)
+if (content) {
 content.removeEventListener('load', plLoadHandler, true);
+if (content.getAttribute("remote") == "true")
+content.messageManager.removeMessageListener('PageLoader:Load', plLoadHandlerMessage);
+}
 if (MozillaFileLogger)
 MozillaFileLogger.close();
 goQuitApplication();