зеркало из https://github.com/mozilla/gecko-dev.git
Merge mozilla-central to mozilla-inbound
This commit is contained in:
Коммит
8601f671dd
|
@ -4413,7 +4413,6 @@ var FullScreen = {
|
|||
// and in tabs-on-bottom mode, move them back to the navigation toolbar.
|
||||
// When there is a chance the tab bar may be collapsed, put window
|
||||
// controls on nav bar.
|
||||
var fullscreenflex = document.getElementById("fullscreenflex");
|
||||
var fullscreenctls = document.getElementById("window-controls");
|
||||
var navbar = document.getElementById("nav-bar");
|
||||
var ctlsOnTabbar = window.toolbar.visible &&
|
||||
|
@ -4421,14 +4420,12 @@ var FullScreen = {
|
|||
(TabsOnTop.enabled &&
|
||||
!gPrefService.getBoolPref("browser.tabs.autoHide")));
|
||||
if (fullscreenctls.parentNode == navbar && ctlsOnTabbar) {
|
||||
fullscreenctls.removeAttribute("flex");
|
||||
document.getElementById("TabsToolbar").appendChild(fullscreenctls);
|
||||
// we don't need this space in tabs-on-top mode, so prevent it from
|
||||
// being shown
|
||||
fullscreenflex.removeAttribute("fullscreencontrol");
|
||||
}
|
||||
else if (fullscreenctls.parentNode.id == "TabsToolbar" && !ctlsOnTabbar) {
|
||||
fullscreenctls.setAttribute("flex", "1");
|
||||
navbar.appendChild(fullscreenctls);
|
||||
fullscreenflex.setAttribute("fullscreencontrol", "true");
|
||||
}
|
||||
|
||||
var controls = document.getElementsByAttribute("fullscreencontrol", "true");
|
||||
|
|
|
@ -475,7 +475,7 @@
|
|||
toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
|
||||
fullscreentoolbar="true" mode="icons" customizable="true"
|
||||
iconsize="large"
|
||||
defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls"
|
||||
defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,window-controls"
|
||||
context="toolbar-context-menu">
|
||||
|
||||
<toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
|
||||
|
@ -697,8 +697,7 @@
|
|||
</toolbarbutton>
|
||||
</toolbaritem>
|
||||
|
||||
<hbox id="fullscreenflex" flex="1" hidden="true" fullscreencontrol="true"/>
|
||||
<hbox id="window-controls" hidden="true" fullscreencontrol="true">
|
||||
<hbox id="window-controls" hidden="true" fullscreencontrol="true" pack="end">
|
||||
<toolbarbutton id="minimize-button"
|
||||
tooltiptext="&fullScreenMinimize.tooltip;"
|
||||
oncommand="window.minimize();"/>
|
||||
|
|
|
@ -54,10 +54,6 @@
|
|||
#include "nsIStringBundle.h"
|
||||
#include "nsXPCOMCID.h"
|
||||
|
||||
#define MIGRATION_BUNDLE "chrome://browser/locale/migration/migration.properties"
|
||||
|
||||
#define DEFAULT_BOOKMARKS NS_LITERAL_CSTRING("resource:///defaults/profile/bookmarks.html")
|
||||
|
||||
void SetUnicharPref(const char* aPref, const nsAString& aValue,
|
||||
nsIPrefBranch* aPrefs)
|
||||
{
|
||||
|
|
|
@ -1243,13 +1243,7 @@ BrowserGlue.prototype = {
|
|||
// Need to migrate only if toolbar is customized and the element is not found.
|
||||
if (currentset &&
|
||||
currentset.indexOf("bookmarks-menu-button-container") == -1) {
|
||||
if (currentset.indexOf("fullscreenflex") != -1) {
|
||||
currentset = currentset.replace(/(^|,)fullscreenflex($|,)/,
|
||||
"$1bookmarks-menu-button-container,fullscreenflex$2")
|
||||
}
|
||||
else {
|
||||
currentset += ",bookmarks-menu-button-container";
|
||||
}
|
||||
this._setPersist(toolbarResource, currentsetResource, currentset);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1148,7 +1148,7 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
|
|||
|
||||
/* ::::: fullscreen window controls ::::: */
|
||||
|
||||
#TabsToolbar > #window-controls {
|
||||
#window-controls {
|
||||
-moz-margin-start: 4px;
|
||||
}
|
||||
|
||||
|
|
|
@ -943,16 +943,17 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
|
|||
nsIScriptGlobalObject *global = context->GetGlobalObject();
|
||||
// XXX should we check for sysprin instead of a chrome window, to make
|
||||
// XXX components be covered by the chrome pref instead of the content one?
|
||||
nsCOMPtr<nsIDOMWindow> contentWindow(do_QueryInterface(global));
|
||||
nsCOMPtr<nsIDOMChromeWindow> chromeWindow(do_QueryInterface(global));
|
||||
|
||||
bool useMethodJIT = Preferences::GetBool(chromeWindow ?
|
||||
bool useMethodJIT = Preferences::GetBool(chromeWindow || !contentWindow ?
|
||||
js_methodjit_chrome_str :
|
||||
js_methodjit_content_str);
|
||||
bool usePCCounts = Preferences::GetBool(chromeWindow ?
|
||||
bool usePCCounts = Preferences::GetBool(chromeWindow || !contentWindow ?
|
||||
js_pccounts_chrome_str :
|
||||
js_pccounts_content_str);
|
||||
bool useMethodJITAlways = Preferences::GetBool(js_methodjit_always_str);
|
||||
bool useTypeInference = !chromeWindow && Preferences::GetBool(js_typeinfer_str);
|
||||
bool useTypeInference = !chromeWindow && contentWindow && Preferences::GetBool(js_typeinfer_str);
|
||||
bool useHardening = Preferences::GetBool(js_jit_hardening_str);
|
||||
nsCOMPtr<nsIXULRuntime> xr = do_GetService(XULRUNTIME_SERVICE_CONTRACTID);
|
||||
if (xr) {
|
||||
|
@ -992,7 +993,7 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
|
|||
// javascript.options.strict.debug is true
|
||||
bool strictDebug = Preferences::GetBool(js_strict_debug_option_str);
|
||||
if (strictDebug && (newDefaultJSOptions & JSOPTION_STRICT) == 0) {
|
||||
if (chromeWindow)
|
||||
if (chromeWindow || !contentWindow)
|
||||
newDefaultJSOptions |= JSOPTION_STRICT;
|
||||
}
|
||||
#endif
|
||||
|
@ -2746,7 +2747,7 @@ nsJSContext::InitClasses(JSObject* aGlobalObj)
|
|||
|
||||
JSAutoRequest ar(mContext);
|
||||
|
||||
::JS_SetOptions(mContext, mDefaultJSOptions);
|
||||
JSOptionChangedCallback(js_options_dot_str, this);
|
||||
|
||||
// Attempt to initialize profiling functions
|
||||
::JS_DefineProfilingFunctions(mContext, aGlobalObj);
|
||||
|
|
|
@ -344,6 +344,13 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(IDBKeyRange)
|
|||
|
||||
DOMCI_DATA(IDBKeyRange, IDBKeyRange)
|
||||
|
||||
IDBKeyRange::~IDBKeyRange()
|
||||
{
|
||||
if (mRooted) {
|
||||
NS_DROP_JS_OBJECTS(this, IDBKeyRange);
|
||||
}
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
IDBKeyRange::GetLower(JSContext* aCx,
|
||||
jsval* aLower)
|
||||
|
|
|
@ -170,7 +170,7 @@ public:
|
|||
}
|
||||
|
||||
protected:
|
||||
~IDBKeyRange() { }
|
||||
~IDBKeyRange();
|
||||
|
||||
Key mLower;
|
||||
Key mUpper;
|
||||
|
|
Загрузка…
Ссылка в новой задаче