merge autoland to mozilla-central a=merge

dothq · Dec 16, 2016 · 863e873 · 863e873
2 parents 6ae9542 + c6f3dc1
commit 863e873
Show file tree

Hide file tree

Showing 154 changed files with 2,758 additions and 5,388 deletions.
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -216,6 +216,8 @@ pref("browser.shell.defaultBrowserCheckCount", 0);
 // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
 pref("browser.startup.page",                1);
 pref("browser.startup.homepage",            "chrome://branding/locale/browserconfig.properties");
+// Whether we should skip the homepage when opening the first-run page
+pref("browser.startup.firstrunSkipsHomepage", false);
 
 pref("browser.slowStartup.notificationDisabled", false);
 pref("browser.slowStartup.timeThreshold", 40000);

diff --git a/browser/base/content/downloadManagerOverlay.xul b/browser/base/content/downloadManagerOverlay.xul
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
@@ -4,7 +4,6 @@
 browser.jar:
 %  content browser %content/browser/ contentaccessible=yes
 #ifdef XP_MACOSX
-%  overlay chrome://mozapps/content/downloads/downloads.xul chrome://browser/content/downloadManagerOverlay.xul
 %  overlay chrome://mozapps/content/update/updates.xul chrome://browser/content/softwareUpdateOverlay.xul
 #endif
 #ifdef XP_WIN
@@ -174,7 +173,6 @@ browser.jar:
 *       content/browser/hiddenWindow.xul              (content/hiddenWindow.xul)
 #ifdef XP_MACOSX
 *       content/browser/macBrowserOverlay.xul         (content/macBrowserOverlay.xul)
-*       content/browser/downloadManagerOverlay.xul    (content/downloadManagerOverlay.xul)
 *       content/browser/softwareUpdateOverlay.xul  (content/softwareUpdateOverlay.xul)
 #endif
 *       content/browser/viewSourceOverlay.xul         (content/viewSourceOverlay.xul)

diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js
@@ -551,8 +551,11 @@ nsBrowserContentHandler.prototype = {
     if (startPage == "about:blank")
       startPage = "";
 
-    // Only show the startPage if we're not restoring an update session.
-    if (overridePage && startPage && !willRestoreSession)
+    let skipStartPage = override == OVERRIDE_NEW_PROFILE &&
+      prefb.getBoolPref("browser.startup.firstrunSkipsHomepage");
+    // Only show the startPage if we're not restoring an update session and are
+    // not set to skip the start page on this profile
+    if (overridePage && startPage && !willRestoreSession && !skipStartPage)
       return overridePage + "|" + startPage;
 
     return overridePage || startPage || "about:blank";

diff --git a/browser/components/syncedtabs/SyncedTabsDeckComponent.js b/browser/components/syncedtabs/SyncedTabsDeckComponent.js
@@ -52,6 +52,7 @@ function SyncedTabsDeckComponent({
     SyncedTabs: SyncedTabs,
     clipboardHelper: Cc["@mozilla.org/widget/clipboardhelper;1"]
                        .getService(Ci.nsIClipboardHelper),
+    getChromeWindow: this._getChromeWindow,
   });
 }
 

diff --git a/browser/components/syncedtabs/TabListComponent.js b/browser/components/syncedtabs/TabListComponent.js
@@ -29,11 +29,13 @@ this.EXPORTED_SYMBOLS = [
  * to state changes so it can rerender.
  */
 
-function TabListComponent({window, store, View, SyncedTabs, clipboardHelper}) {
+function TabListComponent({window, store, View, SyncedTabs, clipboardHelper,
+                           getChromeWindow}) {
   this._window = window;
   this._store = store;
   this._View = View;
   this._clipboardHelper = clipboardHelper;
+  this._getChromeWindow = getChromeWindow;
   // used to trigger Sync from context menu
   this._SyncedTabs = SyncedTabs;
 }
@@ -116,17 +118,16 @@ TabListComponent.prototype = {
     BrowserUITelemetry.countSyncedTabEvent("open", "sidebar");
   },
 
-  onOpenTabs(urls, where, params) {
+  onOpenTabs(urls, where) {
     if (!PlacesUIUtils.confirmOpenInTabs(urls.length, this._window)) {
       return;
     }
     if (where == "window") {
       this._window.openDialog(this._window.getBrowserURL(), "_blank",
                               "chrome,dialog=no,all", urls.join("|"));
     } else {
-      for (let url of urls) {
-        this._window.openUILinkIn(url, where, params);
-      }
+      let loadInBackground = where == "tabshifted" ? true : false;
+      this._getChromeWindow(this._window).gBrowser.loadTabs(urls, loadInBackground, false);
     }
     BrowserUITelemetry.countSyncedTabEvent("openmultiple", "sidebar");
   },

diff --git a/browser/components/syncedtabs/TabListView.js b/browser/components/syncedtabs/TabListView.js
@@ -289,7 +289,7 @@ TabListView.prototype = {
       if (where != "current") {
         const tabs = itemNode.querySelector(".item-tabs-list").childNodes;
         const urls = [...tabs].map(tab => tab.dataset.url);
-        this.props.onOpenTabs(urls, where, {});
+        this.props.onOpenTabs(urls, where);
       }
     }
 

diff --git a/browser/components/syncedtabs/test/xpcshell/test_TabListComponent.js b/browser/components/syncedtabs/test/xpcshell/test_TabListComponent.js
@@ -68,6 +68,13 @@ add_task(function* testInitUninit() {
 
 add_task(function* testActions() {
   let store = new SyncedTabsListStore();
+  let chromeWindowMock = {
+    gBrowser: {
+      loadTabs() {},
+    },
+  };
+  let getChromeWindowMock = sinon.stub();
+  getChromeWindowMock.returns(chromeWindowMock);
   let clipboardHelperMock = {
     copyString() {},
   };
@@ -84,7 +91,8 @@ add_task(function* testActions() {
   };
   let component = new TabListComponent({
     window: windowMock, store, View: null, SyncedTabs,
-    clipboardHelper: clipboardHelperMock});
+    clipboardHelper: clipboardHelperMock,
+    getChromeWindow: getChromeWindowMock });
 
   sinon.stub(store, "getData");
   component.onFilter("query");
@@ -127,12 +135,13 @@ add_task(function* testActions() {
   component.onOpenTab("uri", "where", "params");
   Assert.ok(windowMock.openUILinkIn.calledWith("uri", "where", "params"));
 
-  component.onOpenTabs(["uri1", "uri2"], "where", "params");
-  Assert.ok(windowMock.openUILinkIn.calledWith("uri1", "where", "params"));
-  Assert.ok(windowMock.openUILinkIn.calledWith("uri2", "where", "params"));
-  sinon.spy(windowMock, "openDialog");
-  component.onOpenTabs(["uri1", "uri2"], "window", "params");
-  Assert.deepEqual(windowMock.openDialog.args[0][3], ["uri1", "uri2"].join("|"));
+  sinon.spy(chromeWindowMock.gBrowser, "loadTabs");
+  let tabsToOpen = ["uri1", "uri2"];
+  component.onOpenTabs(tabsToOpen, "where");
+  Assert.ok(getChromeWindowMock.calledWith(windowMock));
+  Assert.ok(chromeWindowMock.gBrowser.loadTabs.calledWith(tabsToOpen, false, false));
+  component.onOpenTabs(tabsToOpen, "tabshifted");
+  Assert.ok(chromeWindowMock.gBrowser.loadTabs.calledWith(tabsToOpen, true, false));
 
   sinon.spy(clipboardHelperMock, "copyString");
   component.onCopyTabLocation("uri");

diff --git a/browser/components/uitour/UITour-lib.js b/browser/components/uitour/UITour-lib.js
@@ -220,6 +220,10 @@ if (typeof Mozilla == 'undefined') {
     });
   };
 
+  Mozilla.UITour.showNewTab = function() {
+    _sendEvent('showNewTab');
+  };
+
   Mozilla.UITour.getConfiguration = function(configName, callback) {
     _sendEvent('getConfiguration', {
       callbackID: _waitForCallback(callback),

diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm
@@ -527,6 +527,11 @@ this.UITour = {
         break;
       }
 
+      case "showNewTab": {
+        this.showNewTab(window, browser);
+        break;
+      }
+
       case "getConfiguration": {
         if (typeof data.configuration != "string") {
           log.warn("getConfiguration: No configuration option specified");
@@ -1744,6 +1749,10 @@ this.UITour = {
     }
   },
 
+  showNewTab: function(aWindow, aBrowser) {
+    aWindow.openLinkIn("about:newtab", "current", {targetBrowser: aBrowser});
+  },
+
   hideAnnotationsForPanel: function(aEvent, aTargetPositionCallback) {
     let win = aEvent.target.ownerGlobal;
     let annotationElements = new Map([

diff --git a/browser/components/uitour/test/browser.ini b/browser/components/uitour/test/browser.ini
@@ -16,6 +16,9 @@ skip-if = true # Bug 1113038 - Intermittent "Popup was opened"
 [browser_trackingProtection.js]
 skip-if = os == "linux" # Intermittent NS_ERROR_NOT_AVAILABLE [nsIUrlClassifierDBService.beginUpdate]
 tag = trackingprotection
+support-files =
+  !/browser/base/content/test/general/benignPage.html
+  !/browser/base/content/test/general/trackingPage.html
 [browser_trackingProtection_tour.js]
 tag = trackingprotection
 [browser_showMenu_controlCenter.js]
@@ -41,5 +44,6 @@ skip-if = true # Disabled due to frequent failures, bugs 1026310 and 1032137
 skip-if = true # Disabled pending removal of pocket UI Tour
 [browser_UITour_registerPageID.js]
 [browser_UITour_resetProfile.js]
+[browser_UITour_showNewTab.js]
 [browser_UITour_sync.js]
 [browser_UITour_toggleReaderMode.js]
diff --git a/browser/components/uitour/test/browser_UITour_showNewTab.js b/browser/components/uitour/test/browser_UITour_showNewTab.js
@@ -0,0 +1,17 @@
+"use strict";
+
+var gTestTab;
+var gContentAPI;
+var gContentWindow;
+
+add_task(setup_UITourTest);
+
+// Test that we can switch to about:newtab
+add_UITour_task(function* test_aboutNewTab() {
+  let newTabLoaded = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, "about:newtab");
+  info("Showing about:newtab");
+  yield gContentAPI.showNewTab();
+  info("Waiting for about:newtab to load");
+  yield newTabLoaded;
+  is(gBrowser.selectedBrowser.currentURI.spec, "about:newtab", "Loaded about:newtab");
+});
diff --git a/browser/config/mozconfigs/linux32/artifact b/browser/config/mozconfigs/linux32/artifact
@@ -8,3 +8,5 @@ ac_add_options --enable-artifact-builds
 ac_add_options --enable-artifact-build-symbols
 unset CC
 unset CXX
+unset RUSTC
+unset CARGO
diff --git a/browser/config/mozconfigs/linux32/beta b/browser/config/mozconfigs/linux32/beta
@@ -11,5 +11,4 @@ ac_add_options --enable-verify-mar
 
 mk_add_options MOZ_PGO=1
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux32/debug b/browser/config/mozconfigs/linux32/debug
@@ -19,6 +19,5 @@ export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux32/debug-artifact b/browser/config/mozconfigs/linux32/debug-artifact
@@ -8,5 +8,7 @@ ac_add_options --enable-artifact-builds
 ac_add_options --enable-artifact-build-symbols
 unset CC
 unset CXX
+unset RUSTC
+unset CARGO
 
 ac_add_options --enable-debug
diff --git a/browser/config/mozconfigs/linux32/nightly b/browser/config/mozconfigs/linux32/nightly
@@ -10,6 +10,5 @@ STRIP_FLAGS="--strip-debug"
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux32/release b/browser/config/mozconfigs/linux32/release
@@ -18,5 +18,4 @@ mk_add_options MOZ_PGO=1
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux64/artifact b/browser/config/mozconfigs/linux64/artifact
@@ -8,3 +8,5 @@ ac_add_options --enable-artifact-builds
 ac_add_options --enable-artifact-build-symbols
 unset CC
 unset CXX
+unset RUSTC
+unset CARGO
diff --git a/browser/config/mozconfigs/linux64/beta b/browser/config/mozconfigs/linux64/beta
@@ -11,5 +11,4 @@ ac_add_options --enable-verify-mar
 
 mk_add_options MOZ_PGO=1
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux64/debug b/browser/config/mozconfigs/linux64/debug
@@ -17,6 +17,5 @@ export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux64/debug-artifact b/browser/config/mozconfigs/linux64/debug-artifact
@@ -8,6 +8,8 @@ ac_add_options --enable-artifact-builds
 ac_add_options --enable-artifact-build-symbols
 unset CC
 unset CXX
+unset RUSTC
+unset CARGO
 
 ac_add_options --enable-debug
 
diff --git a/browser/config/mozconfigs/linux64/hazards b/browser/config/mozconfigs/linux64/hazards
@@ -29,6 +29,11 @@ CFLAGS="$CFLAGS -Wno-attributes"
 CPPFLAGS="$CPPFLAGS -Wno-attributes"
 CXXFLAGS="$CXXFLAGS -Wno-attributes"
 
+# Override rust toolchain paths. In this build they're in $TOOLTOOL_DIR
+# instead of $topsrcdir as referenced by mozconfig.common.
+RUSTC=$TOOLTOOL_DIR/rustc/bin/rustc
+CARGO=$TOOLTOOL_DIR/rustc/bin/cargo
+
 export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
 . $topsrcdir/build/unix/mozconfig.gtk
 

diff --git a/browser/config/mozconfigs/linux64/nightly b/browser/config/mozconfigs/linux64/nightly
@@ -10,6 +10,5 @@ STRIP_FLAGS="--strip-debug"
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/linux64/release b/browser/config/mozconfigs/linux64/release
@@ -18,5 +18,4 @@ mk_add_options MOZ_PGO=1
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/macosx-universal/beta b/browser/config/mozconfigs/macosx-universal/beta
@@ -10,6 +10,5 @@ fi
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly
@@ -16,6 +16,5 @@ fi
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx-universal/release b/browser/config/mozconfigs/macosx-universal/release
@@ -16,6 +16,5 @@ ac_add_options --enable-verify-mar
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx64/artifact b/browser/config/mozconfigs/macosx64/artifact
@@ -11,3 +11,5 @@ ac_add_options --enable-artifact-builds
 ac_add_options --enable-artifact-build-symbols
 unset CC
 unset CXX
+unset RUSTC
+unset CARGO
diff --git a/browser/config/mozconfigs/macosx64/beta b/browser/config/mozconfigs/macosx64/beta
@@ -10,6 +10,5 @@ fi
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug
@@ -19,6 +19,5 @@ export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx64/debug-artifact b/browser/config/mozconfigs/macosx64/debug-artifact
@@ -8,5 +8,7 @@ ac_add_options --enable-artifact-builds
 ac_add_options --enable-artifact-build-symbols
 unset CC
 unset CXX
+unset RUSTC
+unset CARGO
 
 ac_add_options --enable-debug
diff --git a/browser/config/mozconfigs/macosx64/nightly b/browser/config/mozconfigs/macosx64/nightly
@@ -16,6 +16,5 @@ fi
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx64/opt-static-analysis b/browser/config/mozconfigs/macosx64/opt-static-analysis
@@ -10,7 +10,6 @@ ac_add_options --enable-dmd
 
 ac_add_options --enable-clang-plugin
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,5 +11,4 @@ ac_add_options --enable-verify-mar

		mk_add_options MOZ_PGO=1

		. "$topsrcdir/build/mozconfig.rust"
		. "$topsrcdir/build/mozconfig.common.override"