Bug 898170 - Avoid swapping docshells in e10s mode (r=felipe)
authorBill McCloskey <wmccloskey@mozilla.com>
Fri, 26 Jul 2013 14:26:28 -0700
changeset 140216 bf57ad8c6635ed0a52324466785d19ee5f985467
parent 140215 1fb07a6886de97209301e32bdfb8f65c6b698055
child 140217 44b9c24077812f06afad46469081d867d6e6b3b2
push id31649
push userwmccloskey@mozilla.com
push dateFri, 26 Jul 2013 21:28:12 +0000
treeherdermozilla-inbound@be0befd009cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipe
bugs898170
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 898170 - Avoid swapping docshells in e10s mode (r=felipe)
browser/base/content/tabbrowser.xml
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1462,17 +1462,18 @@
 
             b.droppedLinkHandler = handleDroppedLink;
 
             // If we just created a new tab that loads the default
             // newtab url, swap in a preloaded page if possible.
             // Do nothing if we're a private window.
             let docShellsSwapped = false;
             if (aURI == BROWSER_NEW_TAB_URL &&
-                !PrivateBrowsingUtils.isWindowPrivate(window)) {
+                !PrivateBrowsingUtils.isWindowPrivate(window) &&
+                !gMultiProcessBrowser) {
               docShellsSwapped = gBrowserNewTabPreloader.newTab(t);
             }
 
             // Dispatch a new tab notification.  We do this once we're
             // entirely done, so that things are in a consistent state
             // even if the event listener opens or closes tabs.
             var evt = document.createEvent("Events");
             evt.initEvent("TabOpen", true, false);