merge m-c to fx-team FIREFOX_AURORA_24_BASE
authorTim Taubert <ttaubert@mozilla.com>
Mon, 24 Jun 2013 14:29:27 -0400
changeset 143390 8d3810543edccf4fbe458178b88dd4a6e420b010
parent 143388 53d6355ec4b73ca59406275a6ee88b0e382e8236 (current diff)
parent 143389 3cb980ee5440c791999e0193a282b9f3f550b6b5 (diff)
child 143391 976dd158ef7fcbc0b764897333f10b1af81fb0d0
child 143852 5c825170fd14276939cdbba0f90b9b875fa90514
push idunknown
push userunknown
push dateunknown
milestone24.0a1
merge m-c to fx-team
--- a/browser/modules/BrowserNewTabPreloader.jsm
+++ b/browser/modules/BrowserNewTabPreloader.jsm
@@ -17,17 +17,17 @@ Cu.import("resource://gre/modules/Promis
 const HTML_NS = "http://www.w3.org/1999/xhtml";
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 const XUL_PAGE = "data:application/vnd.mozilla.xul+xml;charset=utf-8,<window%20id='win'/>";
 const NEWTAB_URL = "about:newtab";
 const PREF_BRANCH = "browser.newtab.";
 
 // The interval between swapping in a preload docShell and kicking off the
 // next preload in the background.
-const PRELOADER_INTERVAL_MS = 3000;
+const PRELOADER_INTERVAL_MS = 600;
 // The initial delay before we start preloading our first new tab page. The
 // timer is started after the first 'browser-delayed-startup' has been sent.
 const PRELOADER_INIT_DELAY_MS = 5000;
 // The number of miliseconds we'll wait after we received a notification that
 // causes us to update our list of browsers and tabbrowser sizes. This acts as
 // kind of a damper when too many events are occuring in quick succession.
 const PRELOADER_UPDATE_DELAY_MS = 3000;