author | Allison Naaktgeboren <ally@mozilla.com> |
Thu, 22 May 2014 09:09:32 -0700 | |
changeset 184447 | 7d04d18f5eeba956af00fb37e008b266f61503f6 |
parent 184446 | d791ac083c162f038ce29586dba9c91cb1c01489 |
child 184448 | 9fb35ece0bdee88314084d4290aaf9bbd5881dae |
push id | 26823 |
push user | kwierso@gmail.com |
push date | Fri, 23 May 2014 00:11:27 +0000 |
treeherder | mozilla-central@888691d074ae [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mconley, nalexander |
bugs | 1004533 |
milestone | 32.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
|
--- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -22,24 +22,26 @@ accesskey="&newNavigatorCmd.accesskey;" key="key_newNavigator" command="cmd_newNavigator"/> <menuitem id="menu_newPrivateWindow" label="&newPrivateWindow.label;" accesskey="&newPrivateWindow.accesskey;" command="Tools:PrivateBrowsing" key="key_privatebrowsing"/> +#ifdef E10S_TESTING_ONLY <menuitem id="menu_newRemoteWindow" label="New e10s Window" hidden="true" command="Tools:RemoteWindow"/> <menuitem id="menu_newNonRemoteWindow" label="New Non-e10s Window" hidden="true" command="Tools:NonRemoteWindow"/> +#endif #ifdef MAC_NON_BROWSER_WINDOW <menuitem id="menu_openLocation" label="&openLocationCmd.label;" command="Browser:OpenLocation" key="focusURLBar"/> #endif <menuitem id="menu_openFile" label="&openFileCmd.label;"
--- a/browser/base/content/browser-sets.inc +++ b/browser/base/content/browser-sets.inc @@ -105,20 +105,22 @@ <command id="Tools:Eyedropper" oncommand="openEyedropper();"/> <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/> <command id="Tools:ErrorConsole" oncommand="toJavaScriptConsole()" disabled="true" hidden="true"/> <command id="Tools:DevToolsConnect" oncommand="gDevToolsBrowser.openConnectScreen(gBrowser)" disabled="true" hidden="true"/> <command id="Tools:Sanitize" oncommand="Cc['@mozilla.org/browser/browserglue;1'].getService(Ci.nsIBrowserGlue).sanitize(window);"/> <command id="Tools:PrivateBrowsing" oncommand="OpenBrowserWindow({private: true});"/> +#ifdef E10S_TESTING_ONLY <command id="Tools:RemoteWindow" oncommand="OpenBrowserWindow({remote: true});"/> <command id="Tools:NonRemoteWindow" oncommand="OpenBrowserWindow({remote: false});"/> +#endif <command id="History:UndoCloseTab" oncommand="undoCloseTab();"/> <command id="History:UndoCloseWindow" oncommand="undoCloseWindow();"/> <command id="Social:SharePage" oncommand="SocialShare.sharePage();" disabled="true"/> <command id="Social:ToggleSidebar" oncommand="SocialSidebar.toggleSidebar();" hidden="true"/> <command id="Social:ToggleNotifications" oncommand="Social.toggleNotifications();" hidden="true"/> <command id="Social:Addons" oncommand="BrowserOpenAddonsMgr('addons://list/service');"/> <command id="Chat:Focus" oncommand="Cu.import('resource:///modules/Chat.jsm', {}).Chat.focus(window);"/> </commandset>
--- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -96,20 +96,22 @@ <menuitem id="context_tabViewNewGroup" label="&moveToNewGroup.label;" oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/> </menupopup> </menu> <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;" accesskey="&moveToNewWindow.accesskey;" tbattr="tabbrowser-multiple" oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> +#ifdef E10S_TESTING_ONLY <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window" tbattr="tabbrowser-remote" hidden="true" oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/> +#endif <menuseparator/> <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" tbattr="tabbrowser-multiple-visible" oncommand="gBrowser.reloadAllTabs();"/> <menuitem id="context_bookmarkAllTabs" label="&bookmarkAllTabs.label;" accesskey="&bookmarkAllTabs.accesskey;" command="Browser:BookmarkAllTabs"/>
--- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -2515,26 +2515,28 @@ options += "," + name + "=" + aOptions[name]; // tell a new window to take the "dropped" tab return window.openDialog(getBrowserURL(), "_blank", options, aTab); ]]> </body> </method> +#ifdef E10S_TESTING_ONLY <!-- Opens a given tab to a non-remote window. --> <method name="openNonRemoteWindow"> <parameter name="aTab"/> <body> <![CDATA[ let url = aTab.linkedBrowser.currentURI.spec; return window.openDialog("chrome://browser/content/", "_blank", "chrome,all,dialog=no,non-remote", url); ]]> </body> </method> +#endif <method name="moveTabTo"> <parameter name="aTab"/> <parameter name="aIndex"/> <body> <![CDATA[ var oldPosition = aTab._tPos; if (oldPosition == aIndex)
--- a/browser/base/moz.build +++ b/browser/base/moz.build @@ -16,16 +16,17 @@ BROWSER_CHROME_MANIFESTS += [ 'content/test/chat/browser.ini', 'content/test/general/browser.ini', 'content/test/newtab/browser.ini', 'content/test/plugins/browser.ini', 'content/test/social/browser.ini', ] DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] +DEFINES['E10S_TESTING_ONLY'] = CONFIG['E10S_TESTING_ONLY'] DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'): DEFINES['HAVE_SHELL_SERVICE'] = 1 DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm +++ b/browser/components/customizableui/src/CustomizableWidgets.jsm @@ -901,17 +901,17 @@ if (Services.metro && Services.metro.sup win.SwitchToMetro(); } } }); } #endif #endif -#ifdef NIGHTLY_BUILD +#ifdef E10S_TESTING_ONLY /** * The e10s button's purpose is to lower the barrier of entry * for our Nightly testers to use e10s windows. We'll be removing it * once remote tabs are enabled. This button should never ever make it * to production. If it does, that'd be bad, and we should all feel bad. */ if (Services.prefs.getBoolPref("browser.tabs.remote")) { let getCommandFunction = function(aOpenRemote) {
--- a/browser/components/customizableui/src/moz.build +++ b/browser/components/customizableui/src/moz.build @@ -4,16 +4,18 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. EXTRA_JS_MODULES += [ 'DragPositionManager.jsm', 'ScrollbarSampler.jsm', ] +DEFINES['E10S_TESTING_ONLY'] = CONFIG['E10S_TESTING_ONLY'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'): DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1 EXTRA_PP_JS_MODULES += [ 'CustomizableUI.jsm',
--- a/configure.in +++ b/configure.in @@ -3542,16 +3542,27 @@ fi MOZ_ARG_DISABLE_BOOL(unified-compilation, [ --disable-unified-compilation Disable unified compilation of some C/C++ sources], MOZ_DISABLE_UNIFIED_COMPILATION=1, MOZ_DISABLE_UNIFIED_COMPILATION=) AC_SUBST(MOZ_DISABLE_UNIFIED_COMPILATION) +dnl ======================================================== +dnl Multiprocess Firefox Nightly Testing UI +dnl To be removed in Bug 1003313 +dnl ======================================================== +if test -z "$NIGHTLY_BUILD"; then + E10S_TESTING_ONLY=1 +fi + +AC_SUBST(E10S_TESTING_ONLY) + +dnl ======================================================== dnl system libevent Support dnl ======================================================== MOZ_ARG_WITH_STRING(system-libevent, [ --with-system-libevent[=PFX] Use system libevent [installed at prefix PFX]], LIBEVENT_DIR=$withval) _SAVE_CFLAGS=$CFLAGS