Merge mozilla-central to mozilla-inbound on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 04 Nov 2016 11:20:51 +0100
changeset 347704 2a361181d313dc4e7308a705cd6bc3e0fe35ac68
parent 347703 561b87e98adacbd47769a71a0e6c72c5dcf66a9d (current diff)
parent 347608 e00ed3bd29f9cc2ba1dff27acce50d65b57e8c0f (diff)
child 347705 84d61318bd70bdbc2d1eb46656725571f40996c2
push id10298
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:33:03 +0000
treeherdermozilla-aurora@7e29173b1641 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone52.0a1
Merge mozilla-central to mozilla-inbound on a CLOSED TREE
browser/base/content/test/general/browser_bug1299667.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));
 
@@ -4478,23 +4477,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) {
@@ -4538,16 +4540,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
--- a/browser/base/content/test/general/browser_bug1299667.js
+++ b/browser/base/content/test/general/browser_bug1299667.js
@@ -30,16 +30,17 @@ add_task(function* () {
 
   yield receive("sessionstore-state-write-complete");
 
   // Wait for the session data to be flushed before continuing the test
   yield new Promise(resolve => SessionStore.getSessionHistory(gBrowser.selectedTab, resolve));
 
   var backButton = document.getElementById("back-button");
   var contextMenu = document.getElementById("backForwardMenu");
+  var rect = backButton.getBoundingClientRect();
 
   info("waiting for the history menu to open");
 
   let popupShownPromise = BrowserTestUtils.waitForEvent(contextMenu, "popupshown");
   EventUtils.synthesizeMouseAtCenter(backButton, {type: "contextmenu", button: 2});
   let event = yield popupShownPromise;
 
   ok(true, "history menu opened");