summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--application/basilisk/app/Makefile.in2
-rw-r--r--application/basilisk/app/moz.build2
-rw-r--r--application/basilisk/app/profile/basilisk.js (renamed from application/basilisk/app/profile/firefox.js)4
-rw-r--r--application/basilisk/branding/official/pref/basilisk-branding.js (renamed from application/basilisk/branding/official/pref/firefox-branding.js)0
-rw-r--r--application/basilisk/branding/shared/branding.mozbuild2
-rw-r--r--application/basilisk/branding/unofficial/pref/basilisk-branding.js (renamed from application/basilisk/branding/unofficial/pref/firefox-branding.js)0
-rw-r--r--application/basilisk/installer/package-manifest.in4
-rw-r--r--application/palemoon/app/profile/palemoon.js9
-rw-r--r--modules/libpref/init/all.js3
-rw-r--r--netwerk/cache/nsCacheEntryDescriptor.cpp6
-rw-r--r--netwerk/cache2/CacheObserver.cpp9
-rw-r--r--toolkit/components/prompts/src/nsPrompter.js12
-rw-r--r--toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm12
13 files changed, 39 insertions, 26 deletions
diff --git a/application/basilisk/app/Makefile.in b/application/basilisk/app/Makefile.in
index d807b4337..4a3b9758e 100644
--- a/application/basilisk/app/Makefile.in
+++ b/application/basilisk/app/Makefile.in
@@ -42,7 +42,7 @@ libs::
cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
endif
-GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, firefox.js)
+GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, basilisk.js)
endif
diff --git a/application/basilisk/app/moz.build b/application/basilisk/app/moz.build
index 1004e280c..72f34d575 100644
--- a/application/basilisk/app/moz.build
+++ b/application/basilisk/app/moz.build
@@ -9,7 +9,7 @@ DIRS += ['profile/extensions']
GeckoProgram(CONFIG['MOZ_APP_NAME'])
JS_PREFERENCE_PP_FILES += [
- 'profile/firefox.js',
+ 'profile/basilisk.js',
]
SOURCES += [
diff --git a/application/basilisk/app/profile/firefox.js b/application/basilisk/app/profile/basilisk.js
index 196f505fa..2df95a97f 100644
--- a/application/basilisk/app/profile/firefox.js
+++ b/application/basilisk/app/profile/basilisk.js
@@ -77,7 +77,7 @@ pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/f
pref("app.update.checkInstallTime", true);
// The number of days a binary is permitted to be old without checking is defined in
-// firefox-branding.js (app.update.checkInstallTime.days)
+// basilisk-branding.js (app.update.checkInstallTime.days)
// The minimum delay in seconds for the timer to fire between the notification
// of each consumer of the timer manager.
@@ -92,7 +92,7 @@ pref("app.update.timerFirstInterval", 30000);
// App-specific update preferences
// The interval to check for updates (app.update.interval) is defined in
-// firefox-branding.js
+// basilisk-branding.js
// Alternative windowtype for an application update user interface window. When
// a window with this windowtype is open the application update service won't
diff --git a/application/basilisk/branding/official/pref/firefox-branding.js b/application/basilisk/branding/official/pref/basilisk-branding.js
index 190b84e78..190b84e78 100644
--- a/application/basilisk/branding/official/pref/firefox-branding.js
+++ b/application/basilisk/branding/official/pref/basilisk-branding.js
diff --git a/application/basilisk/branding/shared/branding.mozbuild b/application/basilisk/branding/shared/branding.mozbuild
index e6fee3f4e..823439c3f 100644
--- a/application/basilisk/branding/shared/branding.mozbuild
+++ b/application/basilisk/branding/shared/branding.mozbuild
@@ -7,7 +7,7 @@
@template
def ApplicationBranding():
JS_PREFERENCE_PP_FILES += [
- 'pref/firefox-branding.js',
+ 'pref/basilisk-branding.js',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
diff --git a/application/basilisk/branding/unofficial/pref/firefox-branding.js b/application/basilisk/branding/unofficial/pref/basilisk-branding.js
index a5b617a53..a5b617a53 100644
--- a/application/basilisk/branding/unofficial/pref/firefox-branding.js
+++ b/application/basilisk/branding/unofficial/pref/basilisk-branding.js
diff --git a/application/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in
index 6f80a7882..c446d3687 100644
--- a/application/basilisk/installer/package-manifest.in
+++ b/application/basilisk/installer/package-manifest.in
@@ -636,8 +636,8 @@
; [Default Preferences]
; All the pref files must be part of base to prevent migration bugs
-@RESPATH@/browser/@PREF_DIR@/firefox.js
-@RESPATH@/browser/@PREF_DIR@/firefox-branding.js
+@RESPATH@/browser/@PREF_DIR@/basilisk.js
+@RESPATH@/browser/@PREF_DIR@/basilisk-branding.js
@RESPATH@/greprefs.js
@RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/permissions
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index 1894a30f2..5a73e816f 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -1123,11 +1123,16 @@ pref("browser.padlock.urlbar_background", 2);
pref("browser.display.standalone_images.background_color", "#2E3B41");
// These are the thumbnail width/height set in about:newtab.
-// If you change this, ENSURE IT IS THE SAME SIZE SET
-// by about:newtab. These values are in CSS pixels.
+// If you change this, make sure the size is sufficient for tile sizes
+// in about:newtab. These values are in CSS pixels.
pref("toolkit.pageThumbs.minWidth", 250);
pref("toolkit.pageThumbs.minHeight", 180);
+// On GTK, we now default to showing the menubar only when alt is pressed:
+#ifdef MOZ_WIDGET_GTK
+pref("ui.key.menuAccessKeyFocuses", true);
+#endif
+
// ****************** domain-specific UAs ******************
// AMO needs "Firefox", obviously - pass on the OS (determined at build time)
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index d1f047e36..d135f9309 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -42,8 +42,7 @@ pref("browser.cache.auto_delete_cache_version", 0);
// Preference for switching the cache backend, can be changed freely at runtime
// 0 - use the old (Darin's) cache
// 1 - use the new cache back-end (cache v2)
-pref("browser.cache.use_new_backend", 0);
-pref("browser.cache.use_new_backend_temp", true);
+pref("browser.cache.backend", 1);
pref("browser.cache.disk.enable", true);
// Is this the first-time smartsizing has been introduced?
diff --git a/netwerk/cache/nsCacheEntryDescriptor.cpp b/netwerk/cache/nsCacheEntryDescriptor.cpp
index b53ee3058..64765f8aa 100644
--- a/netwerk/cache/nsCacheEntryDescriptor.cpp
+++ b/netwerk/cache/nsCacheEntryDescriptor.cpp
@@ -1399,6 +1399,12 @@ nsCompressOutputStreamWrapper::Close()
// Do not allow to initialize stream after calling Close().
mStreamEnded = true;
+ // In some rare cases, flushing the zlib stream can take too long
+ // and we lose our cache entry in the meantime. Do another check
+ // and bail if so.
+ if (!mDescriptor)
+ return NS_ERROR_NOT_AVAILABLE;
+
if (mDescriptor->CacheEntry()) {
nsAutoCString uncompressedLenStr;
rv = mDescriptor->GetMetaDataElement("uncompressed-len",
diff --git a/netwerk/cache2/CacheObserver.cpp b/netwerk/cache2/CacheObserver.cpp
index 1eb76e8c5..6b6d89395 100644
--- a/netwerk/cache2/CacheObserver.cpp
+++ b/netwerk/cache2/CacheObserver.cpp
@@ -26,8 +26,6 @@ CacheObserver* CacheObserver::sSelf = nullptr;
static uint32_t const kDefaultUseNewCache = 1; // Use the new cache by default
uint32_t CacheObserver::sUseNewCache = kDefaultUseNewCache;
-static bool sUseNewCacheTemp = false; // Temp trigger to not lose early adopters
-
static int32_t const kAutoDeleteCacheVersion = -1; // Auto-delete off by default
static int32_t sAutoDeleteCacheVersion = kAutoDeleteCacheVersion;
@@ -154,9 +152,7 @@ CacheObserver::AttachToPreferences()
"browser.cache.auto_delete_cache_version", kAutoDeleteCacheVersion);
mozilla::Preferences::AddUintVarCache(
- &sUseNewCache, "browser.cache.use_new_backend", kDefaultUseNewCache);
- mozilla::Preferences::AddBoolVarCache(
- &sUseNewCacheTemp, "browser.cache.use_new_backend_temp", false);
+ &sUseNewCache, "browser.cache.backend", kDefaultUseNewCache);
mozilla::Preferences::AddBoolVarCache(
&sUseDiskCache, "browser.cache.disk.enable", kDefaultUseDiskCache);
@@ -297,9 +293,6 @@ bool CacheObserver::UseNewCache()
{
uint32_t useNewCache = sUseNewCache;
- if (sUseNewCacheTemp)
- useNewCache = 1;
-
switch (useNewCache) {
case 0: // use the old cache backend
return false;
diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js
index 26efe28cc..0503b5925 100644
--- a/toolkit/components/prompts/src/nsPrompter.js
+++ b/toolkit/components/prompts/src/nsPrompter.js
@@ -369,7 +369,13 @@ function openTabPrompt(domWin, tabPrompt, args) {
.getInterface(Ci.nsIDocShell);
let inPermitUnload = docShell.contentViewer && docShell.contentViewer.inPermitUnload;
let eventDetail = Cu.cloneInto({tabPrompt: true, inPermitUnload}, domWin);
- PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail);
+ let allowFocusSwitch = true;
+ try {
+ allowFocusSwitch = Services.prefs.getBoolPref("prompts.tab_modal.focusSwitch");
+ } catch(e) {}
+
+ if (allowFocusSwitch)
+ PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail);
let winUtils = domWin.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils);
@@ -395,8 +401,8 @@ function openTabPrompt(domWin, tabPrompt, args) {
frameMM.removeEventListener("pagehide", pagehide, true);
winUtils.leaveModalState();
-
- PromptUtils.fireDialogEvent(domWin, "DOMModalDialogClosed");
+ if (allowFocusSwitch)
+ PromptUtils.fireDialogEvent(domWin, "DOMModalDialogClosed");
}
frameMM.addEventListener("pagehide", pagehide, true);
diff --git a/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm b/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm
index a5bc23ccd..a9201c3da 100644
--- a/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm
+++ b/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm
@@ -59,10 +59,14 @@ var ImageCropper = {
return aImageURL;
}
- if (Services.prefs.getBoolPref("lightweightThemes.animation.enabled")) {
- //Don't crop if animated
- return aImageURL;
- }
+ try {
+ if (Services.prefs.getBoolPref("lightweightThemes.animation.enabled")) {
+ //Don't crop if animated
+ return aImageURL;
+ }
+ } catch(e) {
+ // Continue of pref doesn't exist.
+ }
// Generate the cropped image's file name using its
// base name and the current screen size.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 10:51:51 +0000