wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1004533 - Guard all e10s testing UI behind an E10S_TESTING_UI ifdef.r=mconley,r=nalexander

Browse Source
This commit is contained in:
Allison Naaktgeboren 2014-05-22 09:09:32 -07:00
parent ecf0f3e66c
commit bd0e58c0bb
8 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/browser-menubar.inc
View File

@ -27,6 +27,7 @@
accesskey="&newPrivateWindow.accesskey;"
command="Tools:PrivateBrowsing"
key="key_privatebrowsing"/>
#ifdef E10S_TESTING_ONLY
<menuitem id="menu_newRemoteWindow"
label="New e10s Window"
hidden="true"
@ -35,6 +36,7 @@
label="New Non-e10s Window"
hidden="true"
command="Tools:NonRemoteWindow"/>
#endif
#ifdef MAC_NON_BROWSER_WINDOW
<menuitem id="menu_openLocation"
label="&openLocationCmd.label;"

2
browser/base/content/browser-sets.inc
View File

@ -110,10 +110,12 @@
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"/>

2
browser/base/content/browser.xul
View File

@ -101,10 +101,12 @@
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"

2
browser/base/content/tabbrowser.xml
View File

@ -2520,6 +2520,7 @@
</body>
</method>
#ifdef E10S_TESTING_ONLY
<!-- Opens a given tab to a non-remote window. -->
<method name="openNonRemoteWindow">
<parameter name="aTab"/>
@ -2530,6 +2531,7 @@
]]>
</body>
</method>
#endif
<method name="moveTabTo">
<parameter name="aTab"/>

1
browser/base/moz.build
View File

@ -21,6 +21,7 @@ BROWSER_CHROME_MANIFESTS += [
]
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'):

2
browser/components/customizableui/src/CustomizableWidgets.jsm
View File

@ -906,7 +906,7 @@ if (Services.metro && Services.metro.supported) {
#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

2
browser/components/customizableui/src/moz.build
View File

@ -9,6 +9,8 @@ EXTRA_JS_MODULES += [
'ScrollbarSampler.jsm',
]
DEFINES['E10S_TESTING_ONLY'] = CONFIG['E10S_TESTING_ONLY']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1

11
configure.in
View File

@ -3547,6 +3547,17 @@ MOZ_ARG_DISABLE_BOOL(unified-compilation,
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,