diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 06:16:27 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 06:16:27 +0000 |
commit | c10c12ce84bcc08d00d37be3f19a8fc23ac535ba (patch) | |
tree | 1a07e6b5389c49f68e13bebdf70843884669a31f /browser | |
parent | Adding upstream version 127.0.1. (diff) | |
download | firefox-c10c12ce84bcc08d00d37be3f19a8fc23ac535ba.tar.xz firefox-c10c12ce84bcc08d00d37be3f19a8fc23ac535ba.zip |
Adding upstream version 127.0.2.upstream/127.0.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser')
-rw-r--r-- | browser/app/profile/firefox.js | 4 | ||||
-rw-r--r-- | browser/components/BrowserContentHandler.sys.mjs | 8 | ||||
-rw-r--r-- | browser/components/BrowserGlue.sys.mjs | 4 | ||||
-rw-r--r-- | browser/config/version.txt | 2 | ||||
-rw-r--r-- | browser/config/version_display.txt | 2 | ||||
-rw-r--r-- | browser/extensions/webcompat/data/injections.js | 14 | ||||
-rw-r--r-- | browser/extensions/webcompat/injections/css/bug1882040-disable-pull-to-refresh.css | 14 | ||||
-rw-r--r-- | browser/extensions/webcompat/manifest.json | 2 | ||||
-rw-r--r-- | browser/extensions/webcompat/moz.build | 1 | ||||
-rwxr-xr-x | browser/installer/windows/nsis/shared.nsh | 7 |
10 files changed, 50 insertions, 8 deletions
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 27c2d13fbd..21bbb6c8a9 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -822,6 +822,10 @@ pref("browser.dataFeatureRecommendations.enabled", false); // sets darkTheme data. pref("browser.theme.dark-private-windows", true); +// Pref to control whether or not Private Browsing windows show up +// as separate icons in the Windows taskbar. +pref("browser.privateWindowSeparation.enabled", true); + // Controls visibility of the privacy segmentation preferences section. pref("browser.privacySegmentation.preferences.show", false); diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs index 6c156d1700..1ac7a09d2d 100644 --- a/browser/components/BrowserContentHandler.sys.mjs +++ b/browser/components/BrowserContentHandler.sys.mjs @@ -322,7 +322,13 @@ function openBrowserWindow( Ci.nsILoadContext ).usePrivateBrowsing = true; - if (AppConstants.platform == "win") { + if ( + AppConstants.platform == "win" && + Services.prefs.getBoolPref( + "browser.privateWindowSeparation.enabled", + true + ) + ) { lazy.WinTaskbar.setGroupIdForWindow( win, lazy.WinTaskbar.defaultPrivateGroupId diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs index 81889db040..2f2aa0ac49 100644 --- a/browser/components/BrowserGlue.sys.mjs +++ b/browser/components/BrowserGlue.sys.mjs @@ -2743,6 +2743,10 @@ BrowserGlue.prototype = { name: "ensurePrivateBrowsingShortcutExists", condition: AppConstants.platform == "win" && + Services.prefs.getBoolPref( + "browser.privateWindowSeparation.enabled", + true + ) && // We don't want a shortcut if it's been disabled, eg: by enterprise policy. lazy.PrivateBrowsingUtils.enabled && // Private Browsing shortcuts for packaged builds come with the package, diff --git a/browser/config/version.txt b/browser/config/version.txt index 29810a755b..6f1605c380 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -127.0.1 +127.0.2 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index 29810a755b..6f1605c380 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -127.0.1 +127.0.2 diff --git a/browser/extensions/webcompat/data/injections.js b/browser/extensions/webcompat/data/injections.js index 87b1da747b..a188a40f8d 100644 --- a/browser/extensions/webcompat/data/injections.js +++ b/browser/extensions/webcompat/data/injections.js @@ -1056,6 +1056,20 @@ const AVAILABLE_INJECTIONS = [ ], }, }, + { + id: "1882040", + platform: "android", + domain: "YouTube Shorts", + bug: "1882040", + contentScripts: { + matches: ["*://m.youtube.com/shorts/*"], + css: [ + { + file: "injections/css/bug1882040-disable-pull-to-refresh.css", + }, + ], + }, + }, ]; module.exports = AVAILABLE_INJECTIONS; diff --git a/browser/extensions/webcompat/injections/css/bug1882040-disable-pull-to-refresh.css b/browser/extensions/webcompat/injections/css/bug1882040-disable-pull-to-refresh.css new file mode 100644 index 0000000000..b075f96212 --- /dev/null +++ b/browser/extensions/webcompat/injections/css/bug1882040-disable-pull-to-refresh.css @@ -0,0 +1,14 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * 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/. */ + +/** + * m.youtube.com/shorts - pull-to-refresh breaks scrolling + * Bug #1882040 - https://bugzilla.mozilla.org/show_bug.cgi?id=1882040 + * + * Pull-to-refresh is breaking scrolling on the YouTube Shorts mobile page. + * The easiest work-around is to inject this CSS to disable it for now. + */ +html { + overscroll-behavior: contain; +} diff --git a/browser/extensions/webcompat/manifest.json b/browser/extensions/webcompat/manifest.json index 683ea6c1ae..a0af51cd32 100644 --- a/browser/extensions/webcompat/manifest.json +++ b/browser/extensions/webcompat/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "Web Compatibility Interventions", "description": "Urgent post-release fixes for web compatibility.", - "version": "125.1.0", + "version": "125.2.0", "browser_specific_settings": { "gecko": { "id": "webcompat@mozilla.org", diff --git a/browser/extensions/webcompat/moz.build b/browser/extensions/webcompat/moz.build index a40641f33b..a42e7cb0eb 100644 --- a/browser/extensions/webcompat/moz.build +++ b/browser/extensions/webcompat/moz.build @@ -76,6 +76,7 @@ FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["injections"]["css"] += [ "injections/css/bug1849388-kucharkaprodceru.cz-scroll-fix.css", "injections/css/bug1868345-tvmovie.de-scroll-fix.css", "injections/css/bug1877346-offerup.com-infinite-scroll-fix.css", + "injections/css/bug1882040-disable-pull-to-refresh.css", "injections/css/bug1884842-foodora.cz-height-fix.css", ] diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh index f9f50a5afa..f9cd1feac1 100755 --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -175,6 +175,9 @@ ; updated, but only if we're not the instance of PostUpdate that was started ; by the service, because this needs to run as the actual user. Also, don't do ; that if the installer was told not to register the agent task at all. +; XXXbytesized - This also needs to un-register any scheduled tasks for the WDBA +; that were registered using elevation, but currently it does +; not. See Bugs 1638509 and 1902719. !ifdef MOZ_DEFAULT_BROWSER_AGENT ${If} $TmpVal == "HKCU" ClearErrors @@ -184,10 +187,6 @@ ${If} $TmpVal == "HKCU" ${OrIf} ${Errors} ExecWait '"$INSTDIR\default-browser-agent.exe" register-task $AppUserModelID' ${EndIf} -${ElseIf} $TmpVal == "HKLM" - ; If we're the privileged PostUpdate, make sure that the unprivileged one - ; will have permission to create a task by clearing out the old one first. - ExecWait '"$INSTDIR\default-browser-agent.exe" unregister-task $AppUserModelID' ${EndIf} !endif |