Bug 1300376 fixing conflicts in backout that likely causing tree closing timeouts on a CLOSED TREE r+a=sheriffduty
☠☠ backed out by 8b845f0dfb42 ☠ ☠
authorMark Banner (:standard8) <standard8@mozilla.com>
Fri, 04 Nov 2016 10:04:32 +0100
changeset 320944 8002299dfc3fb3b2c53e50e40a8e16f8dff2c3e7
parent 320943 8d988053f47b7d6357b7cedfb4b0fdfa73e2f728
child 320945 18331b6089e54628314bde71a86498d612d7c346
push id83481
push usercbook@mozilla.com
push dateFri, 04 Nov 2016 10:23:24 +0000
treeherdermozilla-inbound@2a361181d313 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1300376
milestone52.0a1
first release with
nightly linux32
8002299dfc3f / 52.0a1 / 20161104030212 / files
nightly linux64
8002299dfc3f / 52.0a1 / 20161104030212 / files
nightly mac
8002299dfc3f / 52.0a1 / 20161104030212 / files
nightly win32
8002299dfc3f / 52.0a1 / 20161104030212 / files
nightly win64
8002299dfc3f / 52.0a1 / 20161104030212 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1300376 fixing conflicts in backout that likely causing tree closing timeouts on a CLOSED TREE r+a=sheriffduty
browser/base/content/browser.js
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -45,17 +45,16 @@ Cu.import("resource://gre/modules/Notifi
   ["SimpleServiceDiscovery", "resource://gre/modules/SimpleServiceDiscovery.jsm"],
   ["SitePermissions", "resource:///modules/SitePermissions.jsm"],
   ["Social", "resource:///modules/Social.jsm"],
   ["TabCrashHandler", "resource:///modules/ContentCrashHandlers.jsm"],
   ["Task", "resource://gre/modules/Task.jsm"],
   ["TelemetryStopwatch", "resource://gre/modules/TelemetryStopwatch.jsm"],
   ["Translation", "resource:///modules/translation/Translation.jsm"],
   ["UITour", "resource:///modules/UITour.jsm"],
-  ["URLBarZoom", "resource:///modules/URLBarZoom.jsm"],
   ["UpdateUtils", "resource://gre/modules/UpdateUtils.jsm"],
   ["Weave", "resource://services-sync/main.js"],
   ["fxAccounts", "resource://gre/modules/FxAccounts.jsm"],
   ["gDevTools", "resource://devtools/client/framework/gDevTools.jsm"],
   ["gDevToolsBrowser", "resource://devtools/client/framework/gDevTools.jsm"],
   ["webrtcUI", "resource:///modules/webrtcUI.jsm", ]
 ].forEach(([name, resource]) => XPCOMUtils.defineLazyModuleGetter(this, name, resource));
 
@@ -4446,23 +4445,26 @@ var XULBrowserWindow = {
           location == "") {  // Second condition is for new tabs, otherwise
                              // reload function is enabled until tab is refreshed.
         this.reloadCommand.setAttribute("disabled", "true");
       } else {
         this.reloadCommand.removeAttribute("disabled");
       }
 
       URLBarSetURI(aLocationURI);
+
       BookmarkingUI.onLocationChange();
+
       gIdentityHandler.onLocationChange();
+
       SocialUI.updateState();
+
       UITour.onLocationChange(location);
+
       gTabletModePageCounter.inc();
-      ReaderParent.updateReaderButton(gBrowser.selectedBrowser);
-      URLBarZoom.updateZoomButton(gBrowser.selectedBrowser, "browser-fullZoom:location-change");
 
       // Utility functions for disabling find
       var shouldDisableFind = function shouldDisableFind(aDocument) {
         let docElt = aDocument.documentElement;
         return docElt && docElt.getAttribute("disablefastfind") == "true";
       }
 
       var disableFindCommands = function disableFindCommands(aDisable) {
@@ -4506,16 +4508,17 @@ var XULBrowserWindow = {
           gBrowser.selectedTab.hasAttribute("customizemode")) {
         gCustomizeMode.enter();
       } else if (CustomizationHandler.isEnteringCustomizeMode ||
                  CustomizationHandler.isCustomizing()) {
         gCustomizeMode.exit();
       }
     }
     UpdateBackForwardCommands(gBrowser.webNavigation);
+    ReaderParent.updateReaderButton(gBrowser.selectedBrowser);
 
     gGestureSupport.restoreRotationState();
 
     // See bug 358202, when tabs are switched during a drag operation,
     // timers don't fire on windows (bug 203573)
     if (aRequest)
       setTimeout(function () { XULBrowserWindow.asyncUpdateUI(); }, 0);
     else