- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_128_3_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 25 Sep '24

25 Sep '24

Pier Angelo Vendrame pushed new tag FIREFOX_128_3_0esr_BUILD1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] Bug 42832: Download spam prevention exemption for browser extensions.
by ma1 (＠ma1) 25 Sep '24

25 Sep '24

ma1 pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 62b28f16 by hackademix at 2024-09-25T08:26:09+02:00 Bug 42832: Download spam prevention exemption for browser extensions. - - - - - 1 changed file: - uriloader/exthandler/nsExternalHelperAppService.cpp Changes: ===================================== uriloader/exthandler/nsExternalHelperAppService.cpp ===================================== @@ -1900,6 +1900,12 @@ bool nsExternalAppHandler::IsDownloadSpam(nsIChannel* aChannel) { nsCOMPtr<nsIPermissionManager> permissionManager = mozilla::services::GetPermissionManager(); nsCOMPtr<nsIPrincipal> principal = loadInfo->TriggeringPrincipal(); + + // Always allow WebExtensions + if (principal && principal->SchemeIs("moz-extension")) { + return false; + } + bool exactHostMatch = false; constexpr auto type = "automatic-download"_ns; nsCOMPtr<nsIPermission> permission; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/62b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/62b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] Bug 42832: Download spam prevention exemption for browser extensions.
by ma1 (＠ma1) 25 Sep '24

25 Sep '24

ma1 pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: a0680fc3 by hackademix at 2024-09-25T08:26:03+02:00 Bug 42832: Download spam prevention exemption for browser extensions. - - - - - 1 changed file: - uriloader/exthandler/nsExternalHelperAppService.cpp Changes: ===================================== uriloader/exthandler/nsExternalHelperAppService.cpp ===================================== @@ -1900,6 +1900,12 @@ bool nsExternalAppHandler::IsDownloadSpam(nsIChannel* aChannel) { nsCOMPtr<nsIPermissionManager> permissionManager = mozilla::services::GetPermissionManager(); nsCOMPtr<nsIPrincipal> principal = loadInfo->TriggeringPrincipal(); + + // Always allow WebExtensions + if (principal && principal->SchemeIs("moz-extension")) { + return false; + } + bool exactHostMatch = false; constexpr auto type = "automatic-download"_ns; nsCOMPtr<nsIPermission> permission; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a0680fc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a0680fc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] Bug 42832: Download spam prevention exemption for browser extensions.
by ma1 (＠ma1) 25 Sep '24

25 Sep '24

ma1 pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 60192d87 by hackademix at 2024-09-25T07:59:51+02:00 Bug 42832: Download spam prevention exemption for browser extensions. - - - - - 1 changed file: - uriloader/exthandler/nsExternalHelperAppService.cpp Changes: ===================================== uriloader/exthandler/nsExternalHelperAppService.cpp ===================================== @@ -1900,6 +1900,12 @@ bool nsExternalAppHandler::IsDownloadSpam(nsIChannel* aChannel) { nsCOMPtr<nsIPermissionManager> permissionManager = mozilla::services::GetPermissionManager(); nsCOMPtr<nsIPrincipal> principal = loadInfo->TriggeringPrincipal(); + + // Always allow WebExtensions + if (principal && principal->SchemeIs("moz-extension")) { + return false; + } + bool exactHostMatch = false; constexpr auto type = "automatic-download"_ns; nsCOMPtr<nsIPermission> permission; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/60192d8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/60192d8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.15.0esr-13.5-1] 2 commits: Bug 43125: Extend the 13.5 EOL expiry date for tor-browser.
by morgan (＠morgan) 24 Sep '24

24 Sep '24

morgan pushed to branch tor-browser-115.15.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: edd22eaa by Henry Wilkes at 2024-09-24T13:21:35+01:00 Bug 43125: Extend the 13.5 EOL expiry date for tor-browser. - - - - - 87528dc0 by Henry Wilkes at 2024-09-24T13:21:36+01:00 fixup! Tor Browser strings Bug 43125: Add an end of life message for tor-browser only. - - - - - 2 changed files: - browser/base/content/droppedSupportNotification.js - toolkit/locales/en-US/toolkit/global/tor-browser.ftl Changes: ===================================== browser/base/content/droppedSupportNotification.js ===================================== @@ -3,8 +3,8 @@ // Show a prompt that a user's system will no longer be supported. window.addEventListener("load", () => { let labelId; - // Expire date is 2024-10-01 (1st October 2024). - const isExpired = Date.now() > Date.UTC(2024, 9, 1); + // Firefox moved ESR 115 EOL to 1st April 2025. + const isExpired = Date.now() > Date.UTC(2025, 3, 1); if ( AppConstants.platform === "macosx" && @@ -15,14 +15,14 @@ window.addEventListener("load", () => { ) { labelId = isExpired ? "dropped-support-notification-macos-version-less-than-10-15-expired" - : "dropped-support-notification-macos-version-less-than-10-15"; + : "dropped-support-notification-macos-version-less-than-10-15-extended-13-5"; } else if ( AppConstants.platform === "win" && Services.vc.compare(Services.sysinfo.getProperty("version"), "10.0") < 0 ) { labelId = isExpired ? "dropped-support-notification-win-os-version-less-than-10-expired" - : "dropped-support-notification-win-os-version-less-than-10"; + : "dropped-support-notification-win-os-version-less-than-10-extended-13-5"; } const dismissedPref = @@ -44,19 +44,63 @@ window.addEventListener("load", () => { return; } - const buttons = isExpired - ? undefined - : [ - { - "l10n-id": "dropped-support-notification-dismiss-button", - callback: () => { - Services.prefs.setStringPref( - dismissedPref, - AppConstants.BASE_BROWSER_VERSION - ); - }, - }, - ]; + // Locales that have support pages. + // Note, these correspond to their app locale names. + const supportLocales = [ + "en-US", + "ar", + "de", + "es-ES", + "fa", + "fr", + "id", + "it", + "ko", + "pt-BR", + "ro", + "ru", + "sw", + "tr", + "uk", + "vi", + "zh-CN", + "zh-TW", + ]; + // Find the first locale that matches. + let locale = Services.locale.appLocalesAsBCP47.find(l => { + return supportLocales.includes(l); + }); + if (locale === "es-ES") { + // Support page uses "es". All other locales use the same code in Tor + // Browser as the support page. + locale = "es"; + } else if (locale === "en-US") { + // This is the default. + locale = undefined; + } + + const link = `https://support.torproject.org/${ + locale ? `${locale}/` : "" + }tbb/tor-browser-and-legacy-os/`; + + const buttons = [ + { + "l10n-id": "notification-learnmore-default-label", + link, + }, + ]; + + if (!isExpired) { + buttons.push({ + "l10n-id": "dropped-support-notification-dismiss-button", + callback: () => { + Services.prefs.setStringPref( + dismissedPref, + AppConstants.BASE_BROWSER_VERSION + ); + }, + }); + } gNotificationBox.appendNotification( "dropped-support-notification", ===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -633,3 +633,15 @@ onion-neterror-invalid-address-description = The provided onion site address is # "Circuit" refers to a Tor network circuit. onion-neterror-timed-out-header = Onion site circuit creation timed out onion-neterror-timed-out-description = Failed to connect to the onion site, possibly due to a poor network connection. + +## Notification for dropped operating system support. + +# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". +# "13.5" refers to the browser version number. +# "macOS" is a brand name, and 10.15 is the macOS version number. +dropped-support-notification-macos-version-less-than-10-15-extended-13-5 = { -brand-short-name } 13.5 will only receive security updates for a limited time. Please upgrade to macOS 10.15 or later to receive the latest version of { -brand-short-name }. + +# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". +# "13.5" refers to the browser version number. +# "Windows" is a brand name, and "Windows 10" is the version. +dropped-support-notification-win-os-version-less-than-10-extended-13-5 = { -brand-short-name } 13.5 will only receive security updates for a limited time. Please upgrade to Windows 10 or later to receive the latest version of { -brand-short-name }. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c5402a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c5402a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] 4 commits: Bug 1834307: Change StaticPrefs::general_smoothScroll() calls with...
by morgan (＠morgan) 23 Sep '24

23 Sep '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: d899ceb7 by Fatih at 2024-09-23T18:31:25+00:00 Bug 1834307: Change StaticPrefs::general_smoothScroll() calls with nsLayoutUtils::IsSmoothScrollingEnabled. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D221363 - - - - - 9997a81e by Fatih at 2024-09-23T18:31:25+00:00 Bug 1834307: Check RFPTarget::CSSPrefersReducedMotion in nsLayoutUtils::IsSmoothScrollingEnabled. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D221364 - - - - - ef0d9e9a by Morgan at 2024-09-23T18:31:26+00:00 Bug 42070: Hide "Use smooth scrolling" from settings - - - - - 1b7b6e9c by Morgan at 2024-09-23T18:31:26+00:00 fixup! Bug 42027: Base Browser migration procedures. Bug 42078: Hide Smoothscroll UX - - - - - 9 changed files: - browser/components/BrowserGlue.sys.mjs - browser/components/preferences/main.inc.xhtml - gfx/layers/apz/src/APZInputBridge.cpp - gfx/layers/apz/src/APZPublicUtils.cpp - gfx/layers/apz/src/GenericScrollAnimation.cpp - gfx/layers/apz/src/WheelScrollAnimation.cpp - layout/base/nsLayoutUtils.cpp - layout/xul/nsSliderFrame.cpp - widget/cocoa/nsChildView.mm Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -4650,7 +4650,8 @@ BrowserGlue.prototype = { // the security level anymore (tor-browser#42149). // Also, reset security.xfocsp.errorReporting.automatic since we // hid its neterror checkbox. tor-browser#42653. - const MIGRATION_VERSION = 2; + // Version 3: 14.0a7: Reset general.smoothScroll. tor-browser#42070. + const MIGRATION_VERSION = 3; const MIGRATION_PREF = "basebrowser.migration.version"; // We do not care whether this is a new or old profile, since in version 1 // we just quickly clear a user preference, which should not do anything to @@ -4678,6 +4679,11 @@ BrowserGlue.prototype = { Services.prefs.clearUserPref(prefName); } } + if (currentVersion < 3) { + Services.prefs.clearUserPref( + "general.smoothScroll" + ); + } Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); }, ===================================== browser/components/preferences/main.inc.xhtml ===================================== @@ -731,7 +731,8 @@ preference="general.autoScroll"/> <checkbox id="useSmoothScrolling" data-l10n-id="browsing-use-smooth-scrolling" - preference="general.smoothScroll"/> + preference="general.smoothScroll" + hidden="true"/> #ifdef MOZ_WIDGET_GTK <checkbox id="useOverlayScrollbars" data-l10n-id="browsing-gtk-use-non-overlay-scrollbars" ===================================== gfx/layers/apz/src/APZInputBridge.cpp ===================================== @@ -10,6 +10,7 @@ #include "InputData.h" // for MouseInput, etc #include "InputBlockState.h" // for InputBlockState #include "OverscrollHandoffState.h" // for OverscrollHandoffState +#include "nsLayoutUtils.h" // for IsSmoothScrollingEnabled #include "mozilla/EventForwards.h" #include "mozilla/dom/WheelEventBinding.h" // for WheelEvent constants #include "mozilla/EventStateManager.h" // for EventStateManager @@ -270,7 +271,7 @@ APZEventResult APZInputBridge::ReceiveInputEvent( if (Maybe<APZWheelAction> action = ActionForWheelEvent(&wheelEvent)) { ScrollWheelInput::ScrollMode scrollMode = ScrollWheelInput::SCROLLMODE_INSTANT; - if (StaticPrefs::general_smoothScroll() && + if (nsLayoutUtils::IsSmoothScrollingEnabled() && ((wheelEvent.mDeltaMode == dom::WheelEvent_Binding::DOM_DELTA_LINE && StaticPrefs::general_smoothScroll_mouseWheel()) || ===================================== gfx/layers/apz/src/APZPublicUtils.cpp ===================================== @@ -7,6 +7,7 @@ #include "mozilla/layers/APZPublicUtils.h" #include "AsyncPanZoomController.h" +#include "nsLayoutUtils.h" #include "mozilla/HelperMacros.h" #include "mozilla/StaticPrefs_general.h" @@ -36,9 +37,10 @@ ScrollAnimationBezierPhysicsSettings ComputeBezierAnimationSettingsForOrigin( int32_t minMS = 0; int32_t maxMS = 0; bool isOriginSmoothnessEnabled = false; + bool isGeneralSmoothnessEnabled = nsLayoutUtils::IsSmoothScrollingEnabled(); #define READ_DURATIONS(prefbase) \ - isOriginSmoothnessEnabled = StaticPrefs::general_smoothScroll() && \ + isOriginSmoothnessEnabled = isGeneralSmoothnessEnabled && \ StaticPrefs::general_smoothScroll_##prefbase(); \ if (isOriginSmoothnessEnabled) { \ minMS = StaticPrefs::general_smoothScroll_##prefbase##_durationMinMS(); \ @@ -88,7 +90,8 @@ ScrollAnimationBezierPhysicsSettings ComputeBezierAnimationSettingsForOrigin( } ScrollMode GetScrollModeForOrigin(ScrollOrigin origin) { - if (!StaticPrefs::general_smoothScroll()) return ScrollMode::Instant; + bool isSmoothScrollingEnabled = nsLayoutUtils::IsSmoothScrollingEnabled(); + if (!isSmoothScrollingEnabled) return ScrollMode::Instant; switch (origin) { case ScrollOrigin::Lines: return StaticPrefs::general_smoothScroll_lines() ? ScrollMode::Smooth @@ -101,8 +104,8 @@ ScrollMode GetScrollModeForOrigin(ScrollOrigin origin) { : ScrollMode::Instant; default: MOZ_ASSERT(false, "Unknown keyboard scroll origin"); - return StaticPrefs::general_smoothScroll() ? ScrollMode::Smooth - : ScrollMode::Instant; + return isSmoothScrollingEnabled ? ScrollMode::Smooth + : ScrollMode::Instant; } } ===================================== gfx/layers/apz/src/GenericScrollAnimation.cpp ===================================== @@ -8,6 +8,7 @@ #include "AsyncPanZoomController.h" #include "FrameMetrics.h" +#include "nsLayoutUtils.h" #include "mozilla/layers/APZPublicUtils.h" #include "nsPoint.h" #include "ScrollAnimationPhysics.h" @@ -28,7 +29,7 @@ GenericScrollAnimation::GenericScrollAnimation(AsyncPanZoomController& aApzc, // ScrollAnimationBezierPhysics (despite its name) handles the case of // general.smoothScroll being disabled whereas ScrollAnimationMSDPhysics does // not (ie it scrolls smoothly). - if (StaticPrefs::general_smoothScroll() && + if (nsLayoutUtils::IsSmoothScrollingEnabled() && StaticPrefs::general_smoothScroll_msdPhysics_enabled()) { mAnimationPhysics = MakeUnique<ScrollAnimationMSDPhysics>(aInitialPosition); } else { ===================================== gfx/layers/apz/src/WheelScrollAnimation.cpp ===================================== @@ -8,6 +8,7 @@ #include <tuple> #include "AsyncPanZoomController.h" +#include "nsLayoutUtils.h" #include "mozilla/StaticPrefs_general.h" #include "mozilla/layers/APZPublicUtils.h" #include "nsPoint.h" @@ -35,7 +36,7 @@ WheelScrollAnimation::WheelScrollAnimation( ScrollWheelInput::ScrollDeltaType aDeltaType) : GenericScrollAnimation(aApzc, aInitialPosition, OriginForDeltaType(aDeltaType)) { - MOZ_ASSERT(StaticPrefs::general_smoothScroll(), + MOZ_ASSERT(nsLayoutUtils::IsSmoothScrollingEnabled(), "We shouldn't be creating a WheelScrollAnimation if smooth " "scrolling is disabled"); mDirectionForcedToOverscroll = ===================================== layout/base/nsLayoutUtils.cpp ===================================== @@ -7765,28 +7765,23 @@ size_t nsLayoutUtils::SizeOfTextRunsForFrames(nsIFrame* aFrame, /* static */ void nsLayoutUtils::RecomputeSmoothScrollDefault() { + // We want prefers-reduced-motion to determine the default + // value of the general.smoothScroll pref. If the user + // changed the pref we want to respect the change. + Preferences::SetBool( + StaticPrefs::GetPrefName_general_smoothScroll(), + !LookAndFeel::GetInt(LookAndFeel::IntID::PrefersReducedMotion, 0), + PrefValueKind::Default); +} + +/* static */ +bool nsLayoutUtils::IsSmoothScrollingEnabled() { if (nsContentUtils::ShouldResistFingerprinting( "We use the global RFP pref to maintain consistent scroll behavior " "in the browser.", RFPTarget::CSSPrefersReducedMotion)) { - // When resist fingerprinting is enabled, we should not default disable - // smooth scrolls when the user prefers-reduced-motion to avoid leaking - // the value of the OS pref to sites. - Preferences::SetBool(StaticPrefs::GetPrefName_general_smoothScroll(), true, - PrefValueKind::Default); - } else { - // We want prefers-reduced-motion to determine the default - // value of the general.smoothScroll pref. If the user - // changed the pref we want to respect the change. - Preferences::SetBool( - StaticPrefs::GetPrefName_general_smoothScroll(), - !LookAndFeel::GetInt(LookAndFeel::IntID::PrefersReducedMotion, 0), - PrefValueKind::Default); + return true; } -} - -/* static */ -bool nsLayoutUtils::IsSmoothScrollingEnabled() { return StaticPrefs::general_smoothScroll(); } ===================================== layout/xul/nsSliderFrame.cpp ===================================== @@ -1535,7 +1535,7 @@ void nsSliderFrame::PageScroll(bool aClickAndHold) { mCurrentClickHoldDestination = Some(pos); sf->ScrollTo(pos, - StaticPrefs::general_smoothScroll() && + nsLayoutUtils::IsSmoothScrollingEnabled() && StaticPrefs::general_smoothScroll_pages() ? ScrollMode::Smooth : ScrollMode::Instant, ===================================== widget/cocoa/nsChildView.mm ===================================== @@ -3266,7 +3266,7 @@ static gfx::IntPoint GetIntegerDeltaForEvent(NSEvent* aEvent) { } else { ScrollWheelInput::ScrollMode scrollMode = ScrollWheelInput::SCROLLMODE_INSTANT; - if (StaticPrefs::general_smoothScroll() && + if (nsLayoutUtils::IsSmoothScrollingEnabled() && StaticPrefs::general_smoothScroll_mouseWheel()) { scrollMode = ScrollWheelInput::SCROLLMODE_SMOOTH; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/3f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/3f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] 4 commits: Bug 1834307: Change StaticPrefs::general_smoothScroll() calls with...
by morgan (＠morgan) 23 Sep '24

23 Sep '24

morgan pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 48f96fa9 by Fatih at 2024-09-23T18:30:04+00:00 Bug 1834307: Change StaticPrefs::general_smoothScroll() calls with nsLayoutUtils::IsSmoothScrollingEnabled. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D221363 - - - - - 1ecf44c0 by Fatih at 2024-09-23T18:30:05+00:00 Bug 1834307: Check RFPTarget::CSSPrefersReducedMotion in nsLayoutUtils::IsSmoothScrollingEnabled. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D221364 - - - - - 708222bf by Morgan at 2024-09-23T18:30:05+00:00 Bug 42070: Hide "Use smooth scrolling" from settings - - - - - f93056fe by Morgan at 2024-09-23T18:30:05+00:00 fixup! Bug 42027: Base Browser migration procedures. Bug 42078: Hide Smoothscroll UX - - - - - 9 changed files: - browser/components/BrowserGlue.sys.mjs - browser/components/preferences/main.inc.xhtml - gfx/layers/apz/src/APZInputBridge.cpp - gfx/layers/apz/src/APZPublicUtils.cpp - gfx/layers/apz/src/GenericScrollAnimation.cpp - gfx/layers/apz/src/WheelScrollAnimation.cpp - layout/base/nsLayoutUtils.cpp - layout/xul/nsSliderFrame.cpp - widget/cocoa/nsChildView.mm Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -4668,7 +4668,8 @@ BrowserGlue.prototype = { // the security level anymore (tor-browser#42149). // Also, reset security.xfocsp.errorReporting.automatic since we // hid its neterror checkbox. tor-browser#42653. - const MIGRATION_VERSION = 2; + // Version 3: 14.0a7: Reset general.smoothScroll. tor-browser#42070. + const MIGRATION_VERSION = 3; const MIGRATION_PREF = "basebrowser.migration.version"; // We do not care whether this is a new or old profile, since in version 1 // we just quickly clear a user preference, which should not do anything to @@ -4696,6 +4697,11 @@ BrowserGlue.prototype = { Services.prefs.clearUserPref(prefName); } } + if (currentVersion < 3) { + Services.prefs.clearUserPref( + "general.smoothScroll" + ); + } Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); }, ===================================== browser/components/preferences/main.inc.xhtml ===================================== @@ -731,7 +731,8 @@ preference="general.autoScroll"/> <checkbox id="useSmoothScrolling" data-l10n-id="browsing-use-smooth-scrolling" - preference="general.smoothScroll"/> + preference="general.smoothScroll" + hidden="true"/> #ifdef MOZ_WIDGET_GTK <checkbox id="useOverlayScrollbars" data-l10n-id="browsing-gtk-use-non-overlay-scrollbars" ===================================== gfx/layers/apz/src/APZInputBridge.cpp ===================================== @@ -10,6 +10,7 @@ #include "InputData.h" // for MouseInput, etc #include "InputBlockState.h" // for InputBlockState #include "OverscrollHandoffState.h" // for OverscrollHandoffState +#include "nsLayoutUtils.h" // for IsSmoothScrollingEnabled #include "mozilla/EventForwards.h" #include "mozilla/dom/WheelEventBinding.h" // for WheelEvent constants #include "mozilla/EventStateManager.h" // for EventStateManager @@ -270,7 +271,7 @@ APZEventResult APZInputBridge::ReceiveInputEvent( if (Maybe<APZWheelAction> action = ActionForWheelEvent(&wheelEvent)) { ScrollWheelInput::ScrollMode scrollMode = ScrollWheelInput::SCROLLMODE_INSTANT; - if (StaticPrefs::general_smoothScroll() && + if (nsLayoutUtils::IsSmoothScrollingEnabled() && ((wheelEvent.mDeltaMode == dom::WheelEvent_Binding::DOM_DELTA_LINE && StaticPrefs::general_smoothScroll_mouseWheel()) || ===================================== gfx/layers/apz/src/APZPublicUtils.cpp ===================================== @@ -7,6 +7,7 @@ #include "mozilla/layers/APZPublicUtils.h" #include "AsyncPanZoomController.h" +#include "nsLayoutUtils.h" #include "mozilla/HelperMacros.h" #include "mozilla/StaticPrefs_general.h" @@ -36,9 +37,10 @@ ScrollAnimationBezierPhysicsSettings ComputeBezierAnimationSettingsForOrigin( int32_t minMS = 0; int32_t maxMS = 0; bool isOriginSmoothnessEnabled = false; + bool isGeneralSmoothnessEnabled = nsLayoutUtils::IsSmoothScrollingEnabled(); #define READ_DURATIONS(prefbase) \ - isOriginSmoothnessEnabled = StaticPrefs::general_smoothScroll() && \ + isOriginSmoothnessEnabled = isGeneralSmoothnessEnabled && \ StaticPrefs::general_smoothScroll_##prefbase(); \ if (isOriginSmoothnessEnabled) { \ minMS = StaticPrefs::general_smoothScroll_##prefbase##_durationMinMS(); \ @@ -88,7 +90,8 @@ ScrollAnimationBezierPhysicsSettings ComputeBezierAnimationSettingsForOrigin( } ScrollMode GetScrollModeForOrigin(ScrollOrigin origin) { - if (!StaticPrefs::general_smoothScroll()) return ScrollMode::Instant; + bool isSmoothScrollingEnabled = nsLayoutUtils::IsSmoothScrollingEnabled(); + if (!isSmoothScrollingEnabled) return ScrollMode::Instant; switch (origin) { case ScrollOrigin::Lines: return StaticPrefs::general_smoothScroll_lines() ? ScrollMode::Smooth @@ -101,8 +104,8 @@ ScrollMode GetScrollModeForOrigin(ScrollOrigin origin) { : ScrollMode::Instant; default: MOZ_ASSERT(false, "Unknown keyboard scroll origin"); - return StaticPrefs::general_smoothScroll() ? ScrollMode::Smooth - : ScrollMode::Instant; + return isSmoothScrollingEnabled ? ScrollMode::Smooth + : ScrollMode::Instant; } } ===================================== gfx/layers/apz/src/GenericScrollAnimation.cpp ===================================== @@ -8,6 +8,7 @@ #include "AsyncPanZoomController.h" #include "FrameMetrics.h" +#include "nsLayoutUtils.h" #include "mozilla/layers/APZPublicUtils.h" #include "nsPoint.h" #include "ScrollAnimationPhysics.h" @@ -28,7 +29,7 @@ GenericScrollAnimation::GenericScrollAnimation(AsyncPanZoomController& aApzc, // ScrollAnimationBezierPhysics (despite its name) handles the case of // general.smoothScroll being disabled whereas ScrollAnimationMSDPhysics does // not (ie it scrolls smoothly). - if (StaticPrefs::general_smoothScroll() && + if (nsLayoutUtils::IsSmoothScrollingEnabled() && StaticPrefs::general_smoothScroll_msdPhysics_enabled()) { mAnimationPhysics = MakeUnique<ScrollAnimationMSDPhysics>(aInitialPosition); } else { ===================================== gfx/layers/apz/src/WheelScrollAnimation.cpp ===================================== @@ -8,6 +8,7 @@ #include <tuple> #include "AsyncPanZoomController.h" +#include "nsLayoutUtils.h" #include "mozilla/StaticPrefs_general.h" #include "mozilla/layers/APZPublicUtils.h" #include "nsPoint.h" @@ -35,7 +36,7 @@ WheelScrollAnimation::WheelScrollAnimation( ScrollWheelInput::ScrollDeltaType aDeltaType) : GenericScrollAnimation(aApzc, aInitialPosition, OriginForDeltaType(aDeltaType)) { - MOZ_ASSERT(StaticPrefs::general_smoothScroll(), + MOZ_ASSERT(nsLayoutUtils::IsSmoothScrollingEnabled(), "We shouldn't be creating a WheelScrollAnimation if smooth " "scrolling is disabled"); mDirectionForcedToOverscroll = ===================================== layout/base/nsLayoutUtils.cpp ===================================== @@ -7765,28 +7765,23 @@ size_t nsLayoutUtils::SizeOfTextRunsForFrames(nsIFrame* aFrame, /* static */ void nsLayoutUtils::RecomputeSmoothScrollDefault() { + // We want prefers-reduced-motion to determine the default + // value of the general.smoothScroll pref. If the user + // changed the pref we want to respect the change. + Preferences::SetBool( + StaticPrefs::GetPrefName_general_smoothScroll(), + !LookAndFeel::GetInt(LookAndFeel::IntID::PrefersReducedMotion, 0), + PrefValueKind::Default); +} + +/* static */ +bool nsLayoutUtils::IsSmoothScrollingEnabled() { if (nsContentUtils::ShouldResistFingerprinting( "We use the global RFP pref to maintain consistent scroll behavior " "in the browser.", RFPTarget::CSSPrefersReducedMotion)) { - // When resist fingerprinting is enabled, we should not default disable - // smooth scrolls when the user prefers-reduced-motion to avoid leaking - // the value of the OS pref to sites. - Preferences::SetBool(StaticPrefs::GetPrefName_general_smoothScroll(), true, - PrefValueKind::Default); - } else { - // We want prefers-reduced-motion to determine the default - // value of the general.smoothScroll pref. If the user - // changed the pref we want to respect the change. - Preferences::SetBool( - StaticPrefs::GetPrefName_general_smoothScroll(), - !LookAndFeel::GetInt(LookAndFeel::IntID::PrefersReducedMotion, 0), - PrefValueKind::Default); + return true; } -} - -/* static */ -bool nsLayoutUtils::IsSmoothScrollingEnabled() { return StaticPrefs::general_smoothScroll(); } ===================================== layout/xul/nsSliderFrame.cpp ===================================== @@ -1535,7 +1535,7 @@ void nsSliderFrame::PageScroll(bool aClickAndHold) { mCurrentClickHoldDestination = Some(pos); sf->ScrollTo(pos, - StaticPrefs::general_smoothScroll() && + nsLayoutUtils::IsSmoothScrollingEnabled() && StaticPrefs::general_smoothScroll_pages() ? ScrollMode::Smooth : ScrollMode::Instant, ===================================== widget/cocoa/nsChildView.mm ===================================== @@ -3266,7 +3266,7 @@ static gfx::IntPoint GetIntegerDeltaForEvent(NSEvent* aEvent) { } else { ScrollWheelInput::ScrollMode scrollMode = ScrollWheelInput::SCROLLMODE_INSTANT; - if (StaticPrefs::general_smoothScroll() && + if (nsLayoutUtils::IsSmoothScrollingEnabled() && StaticPrefs::general_smoothScroll_mouseWheel()) { scrollMode = ScrollWheelInput::SCROLLMODE_SMOOTH; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/261803… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/261803… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] 4 commits: Bug 1834307: Change StaticPrefs::general_smoothScroll() calls with...
by morgan (＠morgan) 23 Sep '24

23 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: a6a8e4e6 by Fatih at 2024-09-23T18:23:54+00:00 Bug 1834307: Change StaticPrefs::general_smoothScroll() calls with nsLayoutUtils::IsSmoothScrollingEnabled. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D221363 - - - - - 9a15523f by Fatih at 2024-09-23T18:23:54+00:00 Bug 1834307: Check RFPTarget::CSSPrefersReducedMotion in nsLayoutUtils::IsSmoothScrollingEnabled. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D221364 - - - - - 57016f3f by Morgan at 2024-09-23T18:23:54+00:00 Bug 42070: Hide "Use smooth scrolling" from settings - - - - - 6463bb2d by Morgan at 2024-09-23T18:23:54+00:00 fixup! Bug 42027: Base Browser migration procedures. Bug 42078: Hide Smoothscroll UX - - - - - 9 changed files: - browser/components/BrowserGlue.sys.mjs - browser/components/preferences/main.inc.xhtml - gfx/layers/apz/src/APZInputBridge.cpp - gfx/layers/apz/src/APZPublicUtils.cpp - gfx/layers/apz/src/GenericScrollAnimation.cpp - gfx/layers/apz/src/WheelScrollAnimation.cpp - layout/base/nsLayoutUtils.cpp - layout/xul/nsSliderFrame.cpp - widget/cocoa/nsChildView.mm Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -4780,7 +4780,8 @@ BrowserGlue.prototype = { // the security level anymore (tor-browser#42149). // Also, reset security.xfocsp.errorReporting.automatic since we // hid its neterror checkbox. tor-browser#42653. - const MIGRATION_VERSION = 2; + // Version 3: 14.0a7: Reset general.smoothScroll. tor-browser#42070. + const MIGRATION_VERSION = 3; const MIGRATION_PREF = "basebrowser.migration.version"; // We do not care whether this is a new or old profile, since in version 1 // we just quickly clear a user preference, which should not do anything to @@ -4808,6 +4809,11 @@ BrowserGlue.prototype = { Services.prefs.clearUserPref(prefName); } } + if (currentVersion < 3) { + Services.prefs.clearUserPref( + "general.smoothScroll" + ); + } Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); }, ===================================== browser/components/preferences/main.inc.xhtml ===================================== @@ -731,7 +731,8 @@ preference="general.autoScroll"/> <checkbox id="useSmoothScrolling" data-l10n-id="browsing-use-smooth-scrolling" - preference="general.smoothScroll"/> + preference="general.smoothScroll" + hidden="true"/> #ifdef MOZ_WIDGET_GTK <checkbox id="useOverlayScrollbars" data-l10n-id="browsing-gtk-use-non-overlay-scrollbars" ===================================== gfx/layers/apz/src/APZInputBridge.cpp ===================================== @@ -10,6 +10,7 @@ #include "InputData.h" // for MouseInput, etc #include "InputBlockState.h" // for InputBlockState #include "OverscrollHandoffState.h" // for OverscrollHandoffState +#include "nsLayoutUtils.h" // for IsSmoothScrollingEnabled #include "mozilla/EventForwards.h" #include "mozilla/dom/WheelEventBinding.h" // for WheelEvent constants #include "mozilla/EventStateManager.h" // for EventStateManager @@ -270,7 +271,7 @@ APZEventResult APZInputBridge::ReceiveInputEvent( if (Maybe<APZWheelAction> action = ActionForWheelEvent(&wheelEvent)) { ScrollWheelInput::ScrollMode scrollMode = ScrollWheelInput::SCROLLMODE_INSTANT; - if (StaticPrefs::general_smoothScroll() && + if (nsLayoutUtils::IsSmoothScrollingEnabled() && ((wheelEvent.mDeltaMode == dom::WheelEvent_Binding::DOM_DELTA_LINE && StaticPrefs::general_smoothScroll_mouseWheel()) || ===================================== gfx/layers/apz/src/APZPublicUtils.cpp ===================================== @@ -7,6 +7,7 @@ #include "mozilla/layers/APZPublicUtils.h" #include "AsyncPanZoomController.h" +#include "nsLayoutUtils.h" #include "mozilla/HelperMacros.h" #include "mozilla/StaticPrefs_general.h" @@ -36,9 +37,10 @@ ScrollAnimationBezierPhysicsSettings ComputeBezierAnimationSettingsForOrigin( int32_t minMS = 0; int32_t maxMS = 0; bool isOriginSmoothnessEnabled = false; + bool isGeneralSmoothnessEnabled = nsLayoutUtils::IsSmoothScrollingEnabled(); #define READ_DURATIONS(prefbase) \ - isOriginSmoothnessEnabled = StaticPrefs::general_smoothScroll() && \ + isOriginSmoothnessEnabled = isGeneralSmoothnessEnabled && \ StaticPrefs::general_smoothScroll_##prefbase(); \ if (isOriginSmoothnessEnabled) { \ minMS = StaticPrefs::general_smoothScroll_##prefbase##_durationMinMS(); \ @@ -88,7 +90,8 @@ ScrollAnimationBezierPhysicsSettings ComputeBezierAnimationSettingsForOrigin( } ScrollMode GetScrollModeForOrigin(ScrollOrigin origin) { - if (!StaticPrefs::general_smoothScroll()) return ScrollMode::Instant; + bool isSmoothScrollingEnabled = nsLayoutUtils::IsSmoothScrollingEnabled(); + if (!isSmoothScrollingEnabled) return ScrollMode::Instant; switch (origin) { case ScrollOrigin::Lines: return StaticPrefs::general_smoothScroll_lines() ? ScrollMode::Smooth @@ -101,8 +104,8 @@ ScrollMode GetScrollModeForOrigin(ScrollOrigin origin) { : ScrollMode::Instant; default: MOZ_ASSERT(false, "Unknown keyboard scroll origin"); - return StaticPrefs::general_smoothScroll() ? ScrollMode::Smooth - : ScrollMode::Instant; + return isSmoothScrollingEnabled ? ScrollMode::Smooth + : ScrollMode::Instant; } } ===================================== gfx/layers/apz/src/GenericScrollAnimation.cpp ===================================== @@ -8,6 +8,7 @@ #include "AsyncPanZoomController.h" #include "FrameMetrics.h" +#include "nsLayoutUtils.h" #include "mozilla/layers/APZPublicUtils.h" #include "nsPoint.h" #include "ScrollAnimationPhysics.h" @@ -28,7 +29,7 @@ GenericScrollAnimation::GenericScrollAnimation(AsyncPanZoomController& aApzc, // ScrollAnimationBezierPhysics (despite its name) handles the case of // general.smoothScroll being disabled whereas ScrollAnimationMSDPhysics does // not (ie it scrolls smoothly). - if (StaticPrefs::general_smoothScroll() && + if (nsLayoutUtils::IsSmoothScrollingEnabled() && StaticPrefs::general_smoothScroll_msdPhysics_enabled()) { mAnimationPhysics = MakeUnique<ScrollAnimationMSDPhysics>(aInitialPosition); } else { ===================================== gfx/layers/apz/src/WheelScrollAnimation.cpp ===================================== @@ -8,6 +8,7 @@ #include <tuple> #include "AsyncPanZoomController.h" +#include "nsLayoutUtils.h" #include "mozilla/StaticPrefs_general.h" #include "mozilla/layers/APZPublicUtils.h" #include "nsPoint.h" @@ -35,7 +36,7 @@ WheelScrollAnimation::WheelScrollAnimation( ScrollWheelInput::ScrollDeltaType aDeltaType) : GenericScrollAnimation(aApzc, aInitialPosition, OriginForDeltaType(aDeltaType)) { - MOZ_ASSERT(StaticPrefs::general_smoothScroll(), + MOZ_ASSERT(nsLayoutUtils::IsSmoothScrollingEnabled(), "We shouldn't be creating a WheelScrollAnimation if smooth " "scrolling is disabled"); mDirectionForcedToOverscroll = ===================================== layout/base/nsLayoutUtils.cpp ===================================== @@ -7765,28 +7765,23 @@ size_t nsLayoutUtils::SizeOfTextRunsForFrames(nsIFrame* aFrame, /* static */ void nsLayoutUtils::RecomputeSmoothScrollDefault() { + // We want prefers-reduced-motion to determine the default + // value of the general.smoothScroll pref. If the user + // changed the pref we want to respect the change. + Preferences::SetBool( + StaticPrefs::GetPrefName_general_smoothScroll(), + !LookAndFeel::GetInt(LookAndFeel::IntID::PrefersReducedMotion, 0), + PrefValueKind::Default); +} + +/* static */ +bool nsLayoutUtils::IsSmoothScrollingEnabled() { if (nsContentUtils::ShouldResistFingerprinting( "We use the global RFP pref to maintain consistent scroll behavior " "in the browser.", RFPTarget::CSSPrefersReducedMotion)) { - // When resist fingerprinting is enabled, we should not default disable - // smooth scrolls when the user prefers-reduced-motion to avoid leaking - // the value of the OS pref to sites. - Preferences::SetBool(StaticPrefs::GetPrefName_general_smoothScroll(), true, - PrefValueKind::Default); - } else { - // We want prefers-reduced-motion to determine the default - // value of the general.smoothScroll pref. If the user - // changed the pref we want to respect the change. - Preferences::SetBool( - StaticPrefs::GetPrefName_general_smoothScroll(), - !LookAndFeel::GetInt(LookAndFeel::IntID::PrefersReducedMotion, 0), - PrefValueKind::Default); + return true; } -} - -/* static */ -bool nsLayoutUtils::IsSmoothScrollingEnabled() { return StaticPrefs::general_smoothScroll(); } ===================================== layout/xul/nsSliderFrame.cpp ===================================== @@ -1535,7 +1535,7 @@ void nsSliderFrame::PageScroll(bool aClickAndHold) { mCurrentClickHoldDestination = Some(pos); sf->ScrollTo(pos, - StaticPrefs::general_smoothScroll() && + nsLayoutUtils::IsSmoothScrollingEnabled() && StaticPrefs::general_smoothScroll_pages() ? ScrollMode::Smooth : ScrollMode::Instant, ===================================== widget/cocoa/nsChildView.mm ===================================== @@ -3266,7 +3266,7 @@ static gfx::IntPoint GetIntegerDeltaForEvent(NSEvent* aEvent) { } else { ScrollWheelInput::ScrollMode scrollMode = ScrollWheelInput::SCROLLMODE_INSTANT; - if (StaticPrefs::general_smoothScroll() && + if (nsLayoutUtils::IsSmoothScrollingEnabled() && StaticPrefs::general_smoothScroll_mouseWheel()) { scrollMode = ScrollWheelInput::SCROLLMODE_SMOOTH; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/01972d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/01972d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] 2 commits: Bug 1919363 - Only show one app menu "new window" item in permanent private browsing. r=mconley
by morgan (＠morgan) 23 Sep '24

23 Sep '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: db69ea11 by Henry Wilkes at 2024-09-23T18:20:35+00:00 Bug 1919363 - Only show one app menu "new window" item in permanent private browsing. r=mconley We also update the browser_private_browsing_window.js test. The previous test was limited because it was referring to non-existent "appmenu_newNavigator" and "appmenu_newPrivateWindow". Differential Revision: https://phabricator.services.mozilla.com/D222507 - - - - - 3ff1d289 by Henry Wilkes at 2024-09-23T18:20:35+00:00 fixup! Bug 18905: Hide unwanted items from help menu Bug 42362: Stop hiding the Tools:PrivateBrowsing command and shortcut. - - - - - 3 changed files: - browser/base/content/browser-init.js - browser/base/content/browser.js - browser/base/content/test/general/browser_private_browsing_window.js Changes: ===================================== browser/base/content/browser-init.js ===================================== @@ -289,10 +289,7 @@ var gBrowserInit = { this._boundDelayedStartup = this._delayedStartup.bind(this); window.addEventListener("MozAfterPaint", this._boundDelayedStartup); - if ( - PrivateBrowsingUtils.permanentPrivateBrowsing || - !PrivateBrowsingUtils.enabled - ) { + if (!PrivateBrowsingUtils.enabled) { document.getElementById("Tools:PrivateBrowsing").hidden = true; // Setting disabled doesn't disable the shortcut, so we just remove // the keybinding. ===================================== browser/base/content/browser.js ===================================== @@ -6797,15 +6797,34 @@ var gPrivateBrowsingUI = { } if (PrivateBrowsingUtils.permanentPrivateBrowsing) { - // Adjust the New Window menu entries - let newWindow = document.getElementById("menu_newNavigator"); - let newPrivateWindow = document.getElementById("menu_newPrivateWindow"); - if (newWindow && newPrivateWindow) { - newPrivateWindow.hidden = true; - newWindow.label = newPrivateWindow.label; - newWindow.accessKey = newPrivateWindow.accessKey; - newWindow.command = newPrivateWindow.command; - } + let hideNewWindowItem = (windowItem, privateWindowItem) => { + // In permanent browsing mode command "cmd_newNavigator" should act the + // same as "Tools:PrivateBrowsing". + // So we hide the redundant private window item. But we also rename the + // "new window" item to be "new private window". + // NOTE: We choose to hide privateWindowItem rather than windowItem so + // that we still show the "key" for "cmd_newNavigator" (Ctrl+N) rather + // than (Ctrl+Shift+P). + privateWindowItem.hidden = true; + windowItem.setAttribute( + "data-l10n-id", + privateWindowItem.getAttribute("data-l10n-id") + ); + }; + + // Adjust the File menu items. + hideNewWindowItem( + document.getElementById("menu_newNavigator"), + document.getElementById("menu_newPrivateWindow") + ); + // Adjust the App menu items. + hideNewWindowItem( + PanelMultiView.getViewNode(document, "appMenu-new-window-button2"), + PanelMultiView.getViewNode( + document, + "appMenu-new-private-window-button2" + ) + ); } }, }; ===================================== browser/base/content/test/general/browser_private_browsing_window.js ===================================== @@ -1,133 +1,218 @@ -// Make sure that we can open private browsing windows +/* 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/. */ -function test() { - waitForExplicitFinish(); - var nonPrivateWin = OpenBrowserWindow(); - ok( - !PrivateBrowsingUtils.isWindowPrivate(nonPrivateWin), +add_task(async function testOpenBrowserWindow() { + let win = OpenBrowserWindow(); + Assert.ok( + !PrivateBrowsingUtils.isWindowPrivate(win), "OpenBrowserWindow() should open a normal window" ); - nonPrivateWin.close(); + await BrowserTestUtils.closeWindow(win); - var privateWin = OpenBrowserWindow({ private: true }); - ok( - PrivateBrowsingUtils.isWindowPrivate(privateWin), + win = OpenBrowserWindow({ private: true }); + Assert.ok( + PrivateBrowsingUtils.isWindowPrivate(win), "OpenBrowserWindow({private: true}) should open a private window" ); + await BrowserTestUtils.closeWindow(win); - nonPrivateWin = OpenBrowserWindow({ private: false }); - ok( - !PrivateBrowsingUtils.isWindowPrivate(nonPrivateWin), + win = OpenBrowserWindow({ private: false }); + Assert.ok( + !PrivateBrowsingUtils.isWindowPrivate(win), "OpenBrowserWindow({private: false}) should open a normal window" ); - nonPrivateWin.close(); + await BrowserTestUtils.closeWindow(win); - whenDelayedStartupFinished(privateWin, function () { - nonPrivateWin = privateWin.OpenBrowserWindow({ private: false }); - ok( - !PrivateBrowsingUtils.isWindowPrivate(nonPrivateWin), - "privateWin.OpenBrowserWindow({private: false}) should open a normal window" - ); + // In permanent browsing mode. + await SpecialPowers.pushPrefEnv({ + set: [["browser.privatebrowsing.autostart", true]], + }); + + win = OpenBrowserWindow(); + Assert.ok( + PrivateBrowsingUtils.isWindowPrivate(win), + "OpenBrowserWindow() in PBM should open a private window" + ); + await BrowserTestUtils.closeWindow(win); + + win = OpenBrowserWindow({ private: true }); + Assert.ok( + PrivateBrowsingUtils.isWindowPrivate(win), + "OpenBrowserWindow({private: true}) in PBM should open a private window" + ); + await BrowserTestUtils.closeWindow(win); + + win = OpenBrowserWindow({ private: false }); + Assert.ok( + PrivateBrowsingUtils.isWindowPrivate(win), + "OpenBrowserWindow({private: false}) in PBM should open a private window" + ); + await BrowserTestUtils.closeWindow(win); + + await SpecialPowers.popPrefEnv(); +}); - nonPrivateWin.close(); - - [ - { - normal: "menu_newNavigator", - private: "menu_newPrivateWindow", - accesskey: true, - }, - { - normal: "appmenu_newNavigator", - private: "appmenu_newPrivateWindow", - accesskey: false, - }, - ].forEach(function (menu) { - let newWindow = privateWin.document.getElementById(menu.normal); - let newPrivateWindow = privateWin.document.getElementById(menu.private); - if (newWindow && newPrivateWindow) { - ok( - !newPrivateWindow.hidden, - "New Private Window menu item should be hidden" - ); - isnot( - newWindow.label, - newPrivateWindow.label, - "New Window's label shouldn't be overwritten" - ); - if (menu.accesskey) { - isnot( - newWindow.accessKey, - newPrivateWindow.accessKey, - "New Window's accessKey shouldn't be overwritten" - ); - } - isnot( - newWindow.command, - newPrivateWindow.command, - "New Window's command shouldn't be overwritten" - ); - } - }); - - is( - privateWin.gBrowser.tabs[0].label, - "New Private Tab", - "New tabs in the private browsing windows should have 'New Private Tab' as the title." +/** + * Check that the "new window" menu items have the expected properties. + * + * @param {Element} newWindowItem - The "new window" item to check. + * @param {Element} privateWindowItem - The "new private window" item to check. + * @param {Object} expect - The expected properties. + * @param {boolean} expect.privateVisible - Whether we expect the private item + * to be visible or not. + * @param {string} expect.newWindowL10nId - The expected string ID used by the + * "new window" item. + * @param {string} expect.privateWindowL10nId - The expected string ID used by + * the "new private window" item. + * @param {boolean} [useIsVisible=true] - Whether to test the "true" visibility + * of the item. Otherwise only the "hidden" attribute is checked. + */ +function assertMenuItems( + newWindowItem, + privateWindowItem, + expect, + useIsVisible = true +) { + Assert.ok(newWindowItem); + Assert.ok(privateWindowItem); + + if (useIsVisible) { + Assert.ok( + BrowserTestUtils.isVisible(newWindowItem), + "New window item should be visible" ); + } else { + // The application menu is not accessible on macOS, just check the hidden + // attribute. + Assert.ok(!newWindowItem.hidden, "New window item should be visible"); + } + + Assert.equal( + newWindowItem.getAttribute("key"), + "key_newNavigator", + "New window item should use the same key" + ); + Assert.equal( + newWindowItem.getAttribute("data-l10n-id"), + expect.newWindowL10nId + ); - privateWin.close(); - - Services.prefs.setBoolPref("browser.privatebrowsing.autostart", true); - privateWin = OpenBrowserWindow({ private: true }); - whenDelayedStartupFinished(privateWin, function () { - [ - { - normal: "menu_newNavigator", - private: "menu_newPrivateWindow", - accessKey: true, - }, - { - normal: "appmenu_newNavigator", - private: "appmenu_newPrivateWindow", - accessKey: false, - }, - ].forEach(function (menu) { - let newWindow = privateWin.document.getElementById(menu.normal); - let newPrivateWindow = privateWin.document.getElementById(menu.private); - if (newWindow && newPrivateWindow) { - ok( - newPrivateWindow.hidden, - "New Private Window menu item should be hidden" - ); - is( - newWindow.label, - newPrivateWindow.label, - "New Window's label should be overwritten" - ); - if (menu.accesskey) { - is( - newWindow.accessKey, - newPrivateWindow.accessKey, - "New Window's accessKey should be overwritten" - ); - } - is( - newWindow.command, - newPrivateWindow.command, - "New Window's command should be overwritten" - ); - } - }); - - is( - privateWin.gBrowser.tabs[0].label, - "New Tab", - "Normal tab title is used also in the permanent private browsing mode." + if (!expect.privateVisible) { + if (useIsVisible) { + Assert.ok( + BrowserTestUtils.isHidden(privateWindowItem), + "Private window item should be hidden" ); - privateWin.close(); - Services.prefs.clearUserPref("browser.privatebrowsing.autostart"); - finish(); - }); - }); + } else { + Assert.ok( + privateWindowItem.hidden, + "Private window item should be hidden" + ); + } + // Don't check attributes since hidden. + } else { + if (useIsVisible) { + Assert.ok( + BrowserTestUtils.isVisible(privateWindowItem), + "Private window item should be visible" + ); + } else { + Assert.ok( + !privateWindowItem.hidden, + "Private window item should be visible" + ); + } + Assert.equal( + privateWindowItem.getAttribute("key"), + "key_privatebrowsing", + "Private window item should use the same key" + ); + Assert.equal( + privateWindowItem.getAttribute("data-l10n-id"), + expect.privateWindowL10nId + ); + } +} + +/** + * Check that a window has the expected "new window" items in the "File" and app + * menus. + * + * @param {Window} win - The window to check. + * @param {boolean} expectBoth - Whether we expect the window to contain both + * "new window" and "new private window" as separate controls. + */ +async function checkWindowMenus(win, expectBoth) { + // Check the File menu. + assertMenuItems( + win.document.getElementById("menu_newNavigator"), + win.document.getElementById("menu_newPrivateWindow"), + { + privateVisible: expectBoth, + // If in permanent private browsing, expect the new window item to use the + // "New private window" string. + newWindowL10nId: expectBoth + ? "menu-file-new-window" + : "menu-file-new-private-window", + privateWindowL10nId: "menu-file-new-private-window", + }, + // The file menu is difficult to open cross-platform, so we do not open it + // for this test. + false + ); + + // Open the app menu. + let appMenuButton = win.document.getElementById("PanelUI-menu-button"); + let appMenu = win.document.getElementById("appMenu-popup"); + let menuShown = BrowserTestUtils.waitForEvent(appMenu, "popupshown"); + EventUtils.synthesizeMouseAtCenter(appMenuButton, {}, win); + await menuShown; + + // Check the app menu. + assertMenuItems( + win.document.getElementById("appMenu-new-window-button2"), + win.document.getElementById("appMenu-new-private-window-button2"), + { + privateVisible: expectBoth, + // If in permanent private browsing, expect the new window item to use the + // "New private window" string. + newWindowL10nId: expectBoth + ? "appmenuitem-new-window" + : "appmenuitem-new-private-window", + privateWindowL10nId: "appmenuitem-new-private-window", + } + ); + + appMenu.hidePopup(); } + +add_task(async function testNewWindowMenuItems() { + // In non-private window, expect both menu items. + let win = await BrowserTestUtils.openNewBrowserWindow({ + private: false, + }); + await checkWindowMenus(win, true); + Assert.equal(win.gBrowser.currentURI.spec, "about:blank"); + await BrowserTestUtils.closeWindow(win); + + // In non-permanent private window, still expect both menu items. + win = await BrowserTestUtils.openNewBrowserWindow({ + private: true, + }); + await checkWindowMenus(win, true); + Assert.equal(win.gBrowser.currentURI.spec, "about:privatebrowsing"); + await BrowserTestUtils.closeWindow(win); + + // In permanent private browsing, expect only one menu item. + await SpecialPowers.pushPrefEnv({ + set: [["browser.privatebrowsing.autostart", true]], + }); + + win = await BrowserTestUtils.openNewBrowserWindow(); + await checkWindowMenus(win, false); + Assert.equal(win.gBrowser.currentURI.spec, "about:blank"); + await BrowserTestUtils.closeWindow(win); + + await SpecialPowers.popPrefEnv(); +}); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/ea… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/ea… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] 2 commits: Bug 1919363 - Only show one app menu "new window" item in permanent private browsing. r=mconley
by morgan (＠morgan) 23 Sep '24

23 Sep '24

morgan pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 104d7d03 by Henry Wilkes at 2024-09-23T18:19:58+00:00 Bug 1919363 - Only show one app menu "new window" item in permanent private browsing. r=mconley We also update the browser_private_browsing_window.js test. The previous test was limited because it was referring to non-existent "appmenu_newNavigator" and "appmenu_newPrivateWindow". Differential Revision: https://phabricator.services.mozilla.com/D222507 - - - - - 26180332 by Henry Wilkes at 2024-09-23T18:19:58+00:00 fixup! Bug 18905: Hide unwanted items from help menu Bug 42362: Stop hiding the Tools:PrivateBrowsing command and shortcut. - - - - - 3 changed files: - browser/base/content/browser-init.js - browser/base/content/browser.js - browser/base/content/test/general/browser_private_browsing_window.js Changes: ===================================== browser/base/content/browser-init.js ===================================== @@ -289,10 +289,7 @@ var gBrowserInit = { this._boundDelayedStartup = this._delayedStartup.bind(this); window.addEventListener("MozAfterPaint", this._boundDelayedStartup); - if ( - PrivateBrowsingUtils.permanentPrivateBrowsing || - !PrivateBrowsingUtils.enabled - ) { + if (!PrivateBrowsingUtils.enabled) { document.getElementById("Tools:PrivateBrowsing").hidden = true; // Setting disabled doesn't disable the shortcut, so we just remove // the keybinding. ===================================== browser/base/content/browser.js ===================================== @@ -6795,15 +6795,34 @@ var gPrivateBrowsingUI = { } if (PrivateBrowsingUtils.permanentPrivateBrowsing) { - // Adjust the New Window menu entries - let newWindow = document.getElementById("menu_newNavigator"); - let newPrivateWindow = document.getElementById("menu_newPrivateWindow"); - if (newWindow && newPrivateWindow) { - newPrivateWindow.hidden = true; - newWindow.label = newPrivateWindow.label; - newWindow.accessKey = newPrivateWindow.accessKey; - newWindow.command = newPrivateWindow.command; - } + let hideNewWindowItem = (windowItem, privateWindowItem) => { + // In permanent browsing mode command "cmd_newNavigator" should act the + // same as "Tools:PrivateBrowsing". + // So we hide the redundant private window item. But we also rename the + // "new window" item to be "new private window". + // NOTE: We choose to hide privateWindowItem rather than windowItem so + // that we still show the "key" for "cmd_newNavigator" (Ctrl+N) rather + // than (Ctrl+Shift+P). + privateWindowItem.hidden = true; + windowItem.setAttribute( + "data-l10n-id", + privateWindowItem.getAttribute("data-l10n-id") + ); + }; + + // Adjust the File menu items. + hideNewWindowItem( + document.getElementById("menu_newNavigator"), + document.getElementById("menu_newPrivateWindow") + ); + // Adjust the App menu items. + hideNewWindowItem( + PanelMultiView.getViewNode(document, "appMenu-new-window-button2"), + PanelMultiView.getViewNode( + document, + "appMenu-new-private-window-button2" + ) + ); } }, }; ===================================== browser/base/content/test/general/browser_private_browsing_window.js ===================================== @@ -1,133 +1,218 @@ -// Make sure that we can open private browsing windows +/* 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/. */ -function test() { - waitForExplicitFinish(); - var nonPrivateWin = OpenBrowserWindow(); - ok( - !PrivateBrowsingUtils.isWindowPrivate(nonPrivateWin), +add_task(async function testOpenBrowserWindow() { + let win = OpenBrowserWindow(); + Assert.ok( + !PrivateBrowsingUtils.isWindowPrivate(win), "OpenBrowserWindow() should open a normal window" ); - nonPrivateWin.close(); + await BrowserTestUtils.closeWindow(win); - var privateWin = OpenBrowserWindow({ private: true }); - ok( - PrivateBrowsingUtils.isWindowPrivate(privateWin), + win = OpenBrowserWindow({ private: true }); + Assert.ok( + PrivateBrowsingUtils.isWindowPrivate(win), "OpenBrowserWindow({private: true}) should open a private window" ); + await BrowserTestUtils.closeWindow(win); - nonPrivateWin = OpenBrowserWindow({ private: false }); - ok( - !PrivateBrowsingUtils.isWindowPrivate(nonPrivateWin), + win = OpenBrowserWindow({ private: false }); + Assert.ok( + !PrivateBrowsingUtils.isWindowPrivate(win), "OpenBrowserWindow({private: false}) should open a normal window" ); - nonPrivateWin.close(); + await BrowserTestUtils.closeWindow(win); - whenDelayedStartupFinished(privateWin, function () { - nonPrivateWin = privateWin.OpenBrowserWindow({ private: false }); - ok( - !PrivateBrowsingUtils.isWindowPrivate(nonPrivateWin), - "privateWin.OpenBrowserWindow({private: false}) should open a normal window" - ); + // In permanent browsing mode. + await SpecialPowers.pushPrefEnv({ + set: [["browser.privatebrowsing.autostart", true]], + }); + + win = OpenBrowserWindow(); + Assert.ok( + PrivateBrowsingUtils.isWindowPrivate(win), + "OpenBrowserWindow() in PBM should open a private window" + ); + await BrowserTestUtils.closeWindow(win); + + win = OpenBrowserWindow({ private: true }); + Assert.ok( + PrivateBrowsingUtils.isWindowPrivate(win), + "OpenBrowserWindow({private: true}) in PBM should open a private window" + ); + await BrowserTestUtils.closeWindow(win); + + win = OpenBrowserWindow({ private: false }); + Assert.ok( + PrivateBrowsingUtils.isWindowPrivate(win), + "OpenBrowserWindow({private: false}) in PBM should open a private window" + ); + await BrowserTestUtils.closeWindow(win); + + await SpecialPowers.popPrefEnv(); +}); - nonPrivateWin.close(); - - [ - { - normal: "menu_newNavigator", - private: "menu_newPrivateWindow", - accesskey: true, - }, - { - normal: "appmenu_newNavigator", - private: "appmenu_newPrivateWindow", - accesskey: false, - }, - ].forEach(function (menu) { - let newWindow = privateWin.document.getElementById(menu.normal); - let newPrivateWindow = privateWin.document.getElementById(menu.private); - if (newWindow && newPrivateWindow) { - ok( - !newPrivateWindow.hidden, - "New Private Window menu item should be hidden" - ); - isnot( - newWindow.label, - newPrivateWindow.label, - "New Window's label shouldn't be overwritten" - ); - if (menu.accesskey) { - isnot( - newWindow.accessKey, - newPrivateWindow.accessKey, - "New Window's accessKey shouldn't be overwritten" - ); - } - isnot( - newWindow.command, - newPrivateWindow.command, - "New Window's command shouldn't be overwritten" - ); - } - }); - - is( - privateWin.gBrowser.tabs[0].label, - "New Private Tab", - "New tabs in the private browsing windows should have 'New Private Tab' as the title." +/** + * Check that the "new window" menu items have the expected properties. + * + * @param {Element} newWindowItem - The "new window" item to check. + * @param {Element} privateWindowItem - The "new private window" item to check. + * @param {Object} expect - The expected properties. + * @param {boolean} expect.privateVisible - Whether we expect the private item + * to be visible or not. + * @param {string} expect.newWindowL10nId - The expected string ID used by the + * "new window" item. + * @param {string} expect.privateWindowL10nId - The expected string ID used by + * the "new private window" item. + * @param {boolean} [useIsVisible=true] - Whether to test the "true" visibility + * of the item. Otherwise only the "hidden" attribute is checked. + */ +function assertMenuItems( + newWindowItem, + privateWindowItem, + expect, + useIsVisible = true +) { + Assert.ok(newWindowItem); + Assert.ok(privateWindowItem); + + if (useIsVisible) { + Assert.ok( + BrowserTestUtils.isVisible(newWindowItem), + "New window item should be visible" ); + } else { + // The application menu is not accessible on macOS, just check the hidden + // attribute. + Assert.ok(!newWindowItem.hidden, "New window item should be visible"); + } + + Assert.equal( + newWindowItem.getAttribute("key"), + "key_newNavigator", + "New window item should use the same key" + ); + Assert.equal( + newWindowItem.getAttribute("data-l10n-id"), + expect.newWindowL10nId + ); - privateWin.close(); - - Services.prefs.setBoolPref("browser.privatebrowsing.autostart", true); - privateWin = OpenBrowserWindow({ private: true }); - whenDelayedStartupFinished(privateWin, function () { - [ - { - normal: "menu_newNavigator", - private: "menu_newPrivateWindow", - accessKey: true, - }, - { - normal: "appmenu_newNavigator", - private: "appmenu_newPrivateWindow", - accessKey: false, - }, - ].forEach(function (menu) { - let newWindow = privateWin.document.getElementById(menu.normal); - let newPrivateWindow = privateWin.document.getElementById(menu.private); - if (newWindow && newPrivateWindow) { - ok( - newPrivateWindow.hidden, - "New Private Window menu item should be hidden" - ); - is( - newWindow.label, - newPrivateWindow.label, - "New Window's label should be overwritten" - ); - if (menu.accesskey) { - is( - newWindow.accessKey, - newPrivateWindow.accessKey, - "New Window's accessKey should be overwritten" - ); - } - is( - newWindow.command, - newPrivateWindow.command, - "New Window's command should be overwritten" - ); - } - }); - - is( - privateWin.gBrowser.tabs[0].label, - "New Tab", - "Normal tab title is used also in the permanent private browsing mode." + if (!expect.privateVisible) { + if (useIsVisible) { + Assert.ok( + BrowserTestUtils.isHidden(privateWindowItem), + "Private window item should be hidden" ); - privateWin.close(); - Services.prefs.clearUserPref("browser.privatebrowsing.autostart"); - finish(); - }); - }); + } else { + Assert.ok( + privateWindowItem.hidden, + "Private window item should be hidden" + ); + } + // Don't check attributes since hidden. + } else { + if (useIsVisible) { + Assert.ok( + BrowserTestUtils.isVisible(privateWindowItem), + "Private window item should be visible" + ); + } else { + Assert.ok( + !privateWindowItem.hidden, + "Private window item should be visible" + ); + } + Assert.equal( + privateWindowItem.getAttribute("key"), + "key_privatebrowsing", + "Private window item should use the same key" + ); + Assert.equal( + privateWindowItem.getAttribute("data-l10n-id"), + expect.privateWindowL10nId + ); + } +} + +/** + * Check that a window has the expected "new window" items in the "File" and app + * menus. + * + * @param {Window} win - The window to check. + * @param {boolean} expectBoth - Whether we expect the window to contain both + * "new window" and "new private window" as separate controls. + */ +async function checkWindowMenus(win, expectBoth) { + // Check the File menu. + assertMenuItems( + win.document.getElementById("menu_newNavigator"), + win.document.getElementById("menu_newPrivateWindow"), + { + privateVisible: expectBoth, + // If in permanent private browsing, expect the new window item to use the + // "New private window" string. + newWindowL10nId: expectBoth + ? "menu-file-new-window" + : "menu-file-new-private-window", + privateWindowL10nId: "menu-file-new-private-window", + }, + // The file menu is difficult to open cross-platform, so we do not open it + // for this test. + false + ); + + // Open the app menu. + let appMenuButton = win.document.getElementById("PanelUI-menu-button"); + let appMenu = win.document.getElementById("appMenu-popup"); + let menuShown = BrowserTestUtils.waitForEvent(appMenu, "popupshown"); + EventUtils.synthesizeMouseAtCenter(appMenuButton, {}, win); + await menuShown; + + // Check the app menu. + assertMenuItems( + win.document.getElementById("appMenu-new-window-button2"), + win.document.getElementById("appMenu-new-private-window-button2"), + { + privateVisible: expectBoth, + // If in permanent private browsing, expect the new window item to use the + // "New private window" string. + newWindowL10nId: expectBoth + ? "appmenuitem-new-window" + : "appmenuitem-new-private-window", + privateWindowL10nId: "appmenuitem-new-private-window", + } + ); + + appMenu.hidePopup(); } + +add_task(async function testNewWindowMenuItems() { + // In non-private window, expect both menu items. + let win = await BrowserTestUtils.openNewBrowserWindow({ + private: false, + }); + await checkWindowMenus(win, true); + Assert.equal(win.gBrowser.currentURI.spec, "about:blank"); + await BrowserTestUtils.closeWindow(win); + + // In non-permanent private window, still expect both menu items. + win = await BrowserTestUtils.openNewBrowserWindow({ + private: true, + }); + await checkWindowMenus(win, true); + Assert.equal(win.gBrowser.currentURI.spec, "about:privatebrowsing"); + await BrowserTestUtils.closeWindow(win); + + // In permanent private browsing, expect only one menu item. + await SpecialPowers.pushPrefEnv({ + set: [["browser.privatebrowsing.autostart", true]], + }); + + win = await BrowserTestUtils.openNewBrowserWindow(); + await checkWindowMenus(win, false); + Assert.equal(win.gBrowser.currentURI.spec, "about:blank"); + await BrowserTestUtils.closeWindow(win); + + await SpecialPowers.popPrefEnv(); +}); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/60479f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/60479f… You're receiving this email because of your account on gitlab.torproject.org.

1 0