mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 02:14:43 +00:00
Bug 1085622 - Fix E10S_TESTING_ONLY define so that it only ever applies when E10S_TESTING_ONLY config is true. r=ally,glandium.
We were defining the E10S_TESTING_ONLY build-time define with the value of the E10S_TESTING_ONLY config variable, regardless of the value of E10S_TESTING_ONLY. Even if E10S_TESTING_ONLY in configure was blank, we'd still define E10S_TESTING_ONLY, which resulted in E10S_TESTING_ONLY ifdef'd code to be included when we didn't want it to. We now only ever define E10S_TESTING_ONLY iff NIGHTLY_BUILD is defined, and we do it globally. This also fixes a busted E10S_TESTING_ONLY ifdef that didn't have an endif. --HG-- extra : amend_source : 9c8fe8db110765272fa666a5c118d388f87c23d7
This commit is contained in:
parent
a7d0217d78
commit
f9da915811
@ -1194,7 +1194,9 @@ var gBrowserInit = {
|
|||||||
BrowserOffline.init();
|
BrowserOffline.init();
|
||||||
OfflineApps.init();
|
OfflineApps.init();
|
||||||
IndexedDBPromptHelper.init();
|
IndexedDBPromptHelper.init();
|
||||||
|
#ifdef E10S_TESTING_ONLY
|
||||||
gRemoteTabsUI.init();
|
gRemoteTabsUI.init();
|
||||||
|
#endif
|
||||||
|
|
||||||
// Initialize the full zoom setting.
|
// Initialize the full zoom setting.
|
||||||
// We do this before the session restore service gets initialized so we can
|
// We do this before the session restore service gets initialized so we can
|
||||||
@ -7315,14 +7317,9 @@ let gRemoteTabsUI = {
|
|||||||
|
|
||||||
let newRemoteWindow = document.getElementById("menu_newRemoteWindow");
|
let newRemoteWindow = document.getElementById("menu_newRemoteWindow");
|
||||||
let newNonRemoteWindow = document.getElementById("menu_newNonRemoteWindow");
|
let newNonRemoteWindow = document.getElementById("menu_newNonRemoteWindow");
|
||||||
#ifdef E10S_TESTING_ONLY
|
|
||||||
let autostart = Services.appinfo.browserTabsRemoteAutostart;
|
let autostart = Services.appinfo.browserTabsRemoteAutostart;
|
||||||
newRemoteWindow.hidden = autostart;
|
newRemoteWindow.hidden = autostart;
|
||||||
newNonRemoteWindow.hidden = !autostart;
|
newNonRemoteWindow.hidden = !autostart;
|
||||||
#else
|
|
||||||
newRemoteWindow.hidden = true;
|
|
||||||
newNonRemoteWindow.hidden = true;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2594,6 +2594,7 @@
|
|||||||
]]>
|
]]>
|
||||||
</body>
|
</body>
|
||||||
</method>
|
</method>
|
||||||
|
#endif
|
||||||
|
|
||||||
<method name="moveTabTo">
|
<method name="moveTabTo">
|
||||||
<parameter name="aTab"/>
|
<parameter name="aTab"/>
|
||||||
|
@ -24,7 +24,7 @@ BROWSER_CHROME_MANIFESTS += [
|
|||||||
]
|
]
|
||||||
|
|
||||||
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
|
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
|
DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR
|
||||||
|
|
||||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
|
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
|
||||||
|
@ -15,8 +15,6 @@ EXTRA_JS_MODULES += [
|
|||||||
'ScrollbarSampler.jsm',
|
'ScrollbarSampler.jsm',
|
||||||
]
|
]
|
||||||
|
|
||||||
DEFINES['E10S_TESTING_ONLY'] = CONFIG['E10S_TESTING_ONLY']
|
|
||||||
|
|
||||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
|
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
|
||||||
DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
|
DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
|
||||||
|
|
||||||
|
@ -43,8 +43,6 @@ EXTRA_JS_MODULES += [
|
|||||||
'distribution.js',
|
'distribution.js',
|
||||||
]
|
]
|
||||||
|
|
||||||
DEFINES['E10S_TESTING_ONLY'] = CONFIG['E10S_TESTING_ONLY']
|
|
||||||
|
|
||||||
BROWSER_CHROME_MANIFESTS += [
|
BROWSER_CHROME_MANIFESTS += [
|
||||||
'test/browser.ini'
|
'test/browser.ini'
|
||||||
]
|
]
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# 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/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME', 'E10S_TESTING_ONLY'):
|
for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
|
||||||
DEFINES[var] = CONFIG[var]
|
DEFINES[var] = CONFIG[var]
|
||||||
|
|
||||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'cocoa'):
|
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'cocoa'):
|
||||||
|
@ -6,6 +6,4 @@
|
|||||||
|
|
||||||
DIRS += ['communicator']
|
DIRS += ['communicator']
|
||||||
|
|
||||||
DEFINES['E10S_TESTING_ONLY'] = CONFIG['E10S_TESTING_ONLY']
|
|
||||||
|
|
||||||
JAR_MANIFESTS += ['jar.mn']
|
JAR_MANIFESTS += ['jar.mn']
|
||||||
|
@ -6,6 +6,4 @@
|
|||||||
|
|
||||||
DIRS += ['communicator']
|
DIRS += ['communicator']
|
||||||
|
|
||||||
DEFINES['E10S_TESTING_ONLY'] = CONFIG['E10S_TESTING_ONLY']
|
|
||||||
|
|
||||||
JAR_MANIFESTS += ['jar.mn']
|
JAR_MANIFESTS += ['jar.mn']
|
||||||
|
@ -6,6 +6,4 @@
|
|||||||
|
|
||||||
DIRS += ['communicator']
|
DIRS += ['communicator']
|
||||||
|
|
||||||
DEFINES['E10S_TESTING_ONLY'] = CONFIG['E10S_TESTING_ONLY']
|
|
||||||
|
|
||||||
JAR_MANIFESTS += ['jar.mn']
|
JAR_MANIFESTS += ['jar.mn']
|
||||||
|
@ -3569,8 +3569,9 @@ dnl ========================================================
|
|||||||
dnl Multiprocess Firefox Nightly Testing UI
|
dnl Multiprocess Firefox Nightly Testing UI
|
||||||
dnl To be removed in Bug 1003313
|
dnl To be removed in Bug 1003313
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
if test -z "$NIGHTLY_BUILD"; then
|
if test -n "$NIGHTLY_BUILD"; then
|
||||||
E10S_TESTING_ONLY=1
|
E10S_TESTING_ONLY=1
|
||||||
|
AC_DEFINE(E10S_TESTING_ONLY)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(E10S_TESTING_ONLY)
|
AC_SUBST(E10S_TESTING_ONLY)
|
||||||
|
Loading…
Reference in New Issue
Block a user