diff --git a/prefs/firefox/performance.yaml b/prefs/firefox/performance.yaml index c58582064..e972fd471 100644 --- a/prefs/firefox/performance.yaml +++ b/prefs/firefox/performance.yaml @@ -2,18 +2,11 @@ # 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/. -- name: browser.lowMemoryResponseMask - value: 3 - condition: "defined(XP_MACOSX)" - -- name: network.predictor.enable-hover-on-ssl - value: true - # See https://github.com/zen-browser/desktop/issues/11599, this pref seems to # have disabled itself on macos for some unknown reason. # Make sure its in sync with: -# https://searchfox.org/firefox-main/rev/1477feb9706f4ccc5bd571c1c215832a6fbb7464/modules/libpref/init/StaticPrefList.yaml#7741-7748 +# https://searchfox.org/firefox-main/rev/dd2579cb6e7f1761a27ce64fb84d92c61d85c27f/modules/libpref/init/StaticPrefList.yaml#8396 - name: gfx.webrender.compositor - condition: "defined(XP_WIN) || defined(XP_DARWIN)" + condition: "defined(XP_WIN) || defined(XP_DARWIN) || defined(MOZ_WIDGET_GTK)" value: "@cond" mirror: once diff --git a/src/external-patches/firefox/add_urlbar_closeonwindowblur_preference.patch b/src/external-patches/firefox/add_urlbar_closeonwindowblur_preference.patch index 2ff776f82..0f29eec74 100644 --- a/src/external-patches/firefox/add_urlbar_closeonwindowblur_preference.patch +++ b/src/external-patches/firefox/add_urlbar_closeonwindowblur_preference.patch @@ -60,7 +60,7 @@ diff --git a/browser/components/urlbar/content/UrlbarInput.mjs b/browser/compone if (this.view.resultMenu.hasAttribute("open")) { return; } - + lazy.logger.debug("Blur Event"); + if ( + this.document.commandDispatcher.focusedElement == this.inputField && diff --git a/src/external-patches/firefox/expose_tiled_attribute_to_all_platforms/D312091.patch b/src/external-patches/firefox/expose_tiled_attribute_to_all_platforms.patch similarity index 86% rename from src/external-patches/firefox/expose_tiled_attribute_to_all_platforms/D312091.patch rename to src/external-patches/firefox/expose_tiled_attribute_to_all_platforms.patch index 01e85b2ea..1b3e06b11 100644 --- a/src/external-patches/firefox/expose_tiled_attribute_to_all_platforms/D312091.patch +++ b/src/external-patches/firefox/expose_tiled_attribute_to_all_platforms.patch @@ -1,19 +1,19 @@ diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm --- a/widget/cocoa/nsCocoaWindow.mm +++ b/widget/cocoa/nsCocoaWindow.mm -@@ -71,10 +71,11 @@ +@@ -70,10 +70,11 @@ + #include "nsXULPopupManager.h" #include "gfxPlatform.h" #include "qcms.h" - #include +#import + #include #include "mozilla/AutoRestore.h" #include "mozilla/BasicEvents.h" #include "mozilla/Maybe.h" #include "mozilla/NativeKeyBindingsType.h" - #include "mozilla/Preferences.h" -@@ -6948,10 +6949,31 @@ static nsSizeMode GetWindowSizeMode(NSWindow* aWindow, bool aFullScreen) { +@@ -6948,10 +6949,31 @@ return nsSizeMode_Maximized; } return nsSizeMode_Normal; @@ -45,7 +45,7 @@ diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm // Prevent recursion, which can become infinite (see bug 708278). This // can happen when the call to [NSWindow setFrameTopLeftPoint:] in -@@ -6961,10 +6983,11 @@ static nsSizeMode GetWindowSizeMode(NSWindow* aWindow, bool aFullScreen) { +@@ -6961,10 +6983,11 @@ return; } mInReportMoveEvent = true; @@ -57,7 +57,7 @@ diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm // update our internal mSizeMode. This can happen either if we're maximized // and then moved, or if we're not maximized and moved back to zoomed state. if (mWindow && (mSizeMode == nsSizeMode_Maximized) ^ mWindow.isZoomed) { -@@ -7055,10 +7078,11 @@ static nsSizeMode GetWindowSizeMode(NSWindow* aWindow, bool aFullScreen) { +@@ -7055,10 +7078,11 @@ void nsCocoaWindow::ReportSizeEvent() { NS_OBJC_BEGIN_TRY_IGNORE_BLOCK; @@ -69,3 +69,4 @@ diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm mWidgetListener->WindowResized(this, innerBounds.Size()); } if (mAttachedWidgetListener) { + diff --git a/src/zen/common/sys/ZenActorsManager.sys.mjs b/src/zen/common/sys/ZenActorsManager.sys.mjs index 59cac7eba..4b3fc1471 100644 --- a/src/zen/common/sys/ZenActorsManager.sys.mjs +++ b/src/zen/common/sys/ZenActorsManager.sys.mjs @@ -29,6 +29,7 @@ let JSWINDOWACTORS = { DOMContentLoaded: {}, }, }, + safeForUntrustedWebProcess: true, matches: [ ...Services.prefs.getStringPref("zen.injections.match-urls").split(","), "about:preferences", @@ -55,6 +56,7 @@ let JSWINDOWACTORS = { }, allFrames: true, remoteTypes: ["web", "file"], + safeForUntrustedWebProcess: true, enablePreference: "zen.glance.enabled", }, ZenWindowDrag: { @@ -71,6 +73,7 @@ let JSWINDOWACTORS = { }, messageManagerGroups: ["browsers"], remoteTypes: ["web", "file"], + safeForUntrustedWebProcess: true, enablePreference: "zen.view.drag-window-from-content", }, }; @@ -88,6 +91,7 @@ if (!Services.appinfo.inSafeMode) { DOMWindowCreated: {}, }, }, + safeForUntrustedWebProcess: true, allFrames: true, remoteTypes: ["web", "file"], enablePreference: "zen.boosts.enabled",