- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] 2 commits: fixup! [android] Implement Android-native Connection Assist UI
by Dan Ballard (＠dan) 08 Jun '26

08 Jun '26

Dan Ballard pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: bff7e7d7 by clairehurst at 2026-06-08T11:44:47-06:00 fixup! [android] Implement Android-native Connection Assist UI Bug 43576: Connection Assist on Android Fast Follows (Bug 41188) Add frequent regions - - - - - bfdbead3 by clairehurst at 2026-06-08T11:44:47-06:00 fixup! TB 42247: Android helpers for the TorProvider Bug 43576: Connection Assist on Android Fast Follows (Bug 41188) Add frequent regions - - - - - 4 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java - toolkit/modules/TorAndroidIntegration.sys.mjs Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt ===================================== @@ -212,6 +212,7 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler, SystemIn if (screen.regionDropDownVisible) { if (binding.countryDropDown.isEmpty()) { regionDropDownSpinnerAdapter = initializeSpinner() + torConnectionAssistViewModel.fetchFrequentRegions() torConnectionAssistViewModel.fetchRegionNames() } @@ -285,6 +286,18 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler, SystemIn } } + viewLifecycleOwner.lifecycleScope.launch { + repeatOnLifecycle(Lifecycle.State.STARTED) { + torConnectionAssistViewModel.frequentRegionCodes.collect { + if (it != null) { + for (region in it) { + Log.d(TAG, "collected region: $region") + } + } + } + } + } + return spinnerAdapter } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt ===================================== @@ -80,6 +80,14 @@ class TorConnectionAssistViewModel( } } + fun fetchFrequentRegions() { + torAndroidIntegration.frequentRegionNamesGet { frequentRegionNames -> + if (frequentRegionNames != null) { + frequentRegionCodes.value = frequentRegionNames + } + } + } + override fun onCleared() { torAndroidIntegration.unregisterBootstrapStateChangeListener(this) super.onCleared() @@ -96,6 +104,10 @@ class TorConnectionAssistViewModel( MutableStateFlow(null) } + val frequentRegionCodes: MutableStateFlow<Array<String>?> by lazy { + MutableStateFlow(null) + } + val selectedCountryCode: MutableStateFlow<String> by lazy { MutableStateFlow("automatic") } ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java ===================================== @@ -60,6 +60,7 @@ public class TorAndroidIntegration implements BundleEventListener { private static final String EVENT_QUICKSTART_GET = "GeckoView:Tor:QuickstartGet"; private static final String EVENT_QUICKSTART_SET = "GeckoView:Tor:QuickstartSet"; private static final String EVENT_REGION_NAMES_GET = "GeckoView:Tor:RegionNamesGet"; + private static final String EVENT_FREQUENT_REGION_NAMES_GET = "GeckoView:Tor:FrequentRegionNamesGet"; private static final String EVENT_SHOULD_SHOW_TOR_CONNECT = "GeckoView:Tor:ShouldShowTorConnect"; private static final String CONTROL_PORT_FILE = "/control-ipc"; @@ -709,6 +710,19 @@ public class TorAndroidIntegration implements BundleEventListener { }); } + public interface FrequentRegionNamesGetter { + void onValue(String[] frequentRegionNames); + } + + public void frequentRegionNamesGet(FrequentRegionNamesGetter frequentRegionNamesGetter) { + EventDispatcher.getInstance().queryBundle(EVENT_FREQUENT_REGION_NAMES_GET).then( frequentRegionNames -> { + if (frequentRegionNames != null) { + frequentRegionNamesGetter.onValue(frequentRegionNames.getStringArray("codes")); + } + return new GeckoResult<Void>(); + }); + } + public interface ShouldShowTorConnectGetter { void onValue(Boolean shouldShowTorConnect); } ===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -49,6 +49,7 @@ const ListenedEvents = Object.freeze({ quickstartGet: "GeckoView:Tor:QuickstartGet", quickstartSet: "GeckoView:Tor:QuickstartSet", regionNamesGet: "GeckoView:Tor:RegionNamesGet", + frequentRegionNamesGet: "GeckoView:Tor:FrequentRegionNamesGet", shouldShowTorConnectGet: "GeckoView:Tor:ShouldShowTorConnect", }); @@ -213,6 +214,11 @@ class TorAndroidIntegrationImpl { case ListenedEvents.regionNamesGet: callback?.onSuccess(lazy.TorConnect.getRegionNames()); return; + case ListenedEvents.frequentRegionNamesGet: + callback?.onSuccess({ + codes: await lazy.TorConnect.getFrequentRegions(), + }); + return; case ListenedEvents.shouldShowTorConnectGet: callback?.onSuccess(lazy.TorConnect.shouldShowTorConnect()); return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/631e5e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/631e5e… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] [android] Disable features and functionality
by clairehurst (＠clairehurst) 08 Jun '26

08 Jun '26

clairehurst pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 631e5e4c by clairehurst at 2026-06-08T11:34:52-06:00 [android] Disable features and functionality tb#44175: Remove all default browser functionality (Android) - - - - - 3 changed files: - mobile/android/fenix/app/src/main/AndroidManifest.xml - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - mobile/android/fenix/app/src/main/res/xml/preferences.xml Changes: ===================================== mobile/android/fenix/app/src/main/AndroidManifest.xml ===================================== @@ -521,7 +521,6 @@ <data android:host="home"/> <data android:host="home_collections"/> <data android:host="install_search_widget"/> - <data android:host="make_default_browser"/> <data android:host="open"/> <data android:host="settings"/> <data android:host="settings_accessibility"/> @@ -560,54 +559,6 @@ android:exported="true" android:excludeFromRecents="true" > -  - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.APP_BROWSER"/> - <category android:name="android.intent.category.DEFAULT"/> - </intent-filter> - - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.BROWSABLE" /> - <category android:name="mozilla.components.pwa.category.SHORTCUT" /> - <data android:scheme="http" /> - <data android:scheme="https" /> - </intent-filter> - -  - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - <category android:name="android.intent.category.BROWSABLE" /> - <category android:name="android.intent.category.DEFAULT" /> - <data android:scheme="${deepLinkScheme}" - android:host="settings_wallpapers"/> - </intent-filter> - - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - - <category android:name="android.intent.category.BROWSABLE" /> - <category android:name="android.intent.category.DEFAULT" /> - - <data android:scheme="http" /> - <data android:scheme="https" /> - <data android:mimeType="text/html" /> - <data android:mimeType="text/plain" /> - <data android:mimeType="application/xhtml+xml" /> - </intent-filter> - - <intent-filter> <action android:name="android.intent.action.SEARCH" /> ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt ===================================== @@ -615,8 +615,6 @@ class SettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragment, val debuggingKey = getPreferenceKey(R.string.pref_key_remote_debugging) val preferenceLeakCanary = findPreference<Preference>(leakKey) val preferenceRemoteDebugging = findPreference<Preference>(debuggingKey) - val preferenceMakeDefaultBrowser = - requirePreference<DefaultBrowserPreference>(R.string.pref_key_make_default_browser) // Copied from PrivateBrowsingFragment with some removals requirePreference<SwitchPreferenceCompat>(R.string.pref_key_allow_screenshots_in_private_mode).apply { @@ -648,12 +646,6 @@ class SettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragment, true } - preferenceMakeDefaultBrowser.apply { - updateSwitch() - onPreferenceClickListener = - getClickListenerForMakeDefaultBrowser() - } - val preferenceStartProfiler = findPreference<Preference>(getPreferenceKey(R.string.pref_key_start_profiler)) @@ -700,30 +692,6 @@ class SettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragment, setupConnectionPreferences() } - private val setToDefaultPromptRequestLauncher: ActivityResultLauncher<Intent> = - registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> - with(requireContext()) { - maybeNavigateToSystemSetToDefaultAction(result.resultCode, settings(), dateTimeProvider) { - navigateToDefaultBrowserAppsSettings(BuildManufacturerChecker()) - } - } - } - - /** - * For >=Q -> Use new RoleManager API to show in-app browser switching dialog. - * For <Q && >=N -> Navigate user to Android Default Apps Settings. - * For <N -> Open sumo page to show user how to change default app. - */ - private fun getClickListenerForMakeDefaultBrowser(): Preference.OnPreferenceClickListener { - return Preference.OnPreferenceClickListener { - maybeRequestDefaultBrowserPrompt( - WeakReference((requireActivity() as? HomeActivity)), - setToDefaultPromptRequestLauncher, - ) - true - } - } - private fun navigateFromSettings(directions: NavDirections) { view?.findNavController()?.let { navController -> if (navController.currentDestination?.id == R.id.settingsFragment) { ===================================== mobile/android/fenix/app/src/main/res/xml/preferences.xml ===================================== @@ -108,11 +108,6 @@ app:iconSpaceReserved="false" app:isPreferenceVisible="false" android:title="@string/preferences_import_bookmarks" /> - - <org.mozilla.fenix.settings.DefaultBrowserPreference - android:key="@string/pref_key_make_default_browser" - app:iconSpaceReserved="false" - android:title="@string/preferences_set_as_default_browser" /> </androidx.preference.PreferenceCategory> <androidx.preference.PreferenceCategory View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/631e5e4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/631e5e4… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-152.0a1-16.0-2] fixup! Firefox preference overrides.
by henry (＠henry) 08 Jun '26

08 Jun '26

henry pushed to branch mullvad-browser-152.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: bc769667 by Henry Wilkes at 2026-06-08T17:12:43+01:00 fixup! Firefox preference overrides. BB 44857: Drop browser.display.use_system_colors. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -570,11 +570,6 @@ pref("pdfjs.disabled", false, locked); // tor-browser#43850. Keep forced colors off by default for all platforms. // Upstream sets a value of "0" for Windows. pref("browser.display.document_color_use", 1); -// Bug 40057: Ensure system colors are not used for CSS4 colors. -// FIXME: This preference seems to be unread since bugzilla bug 1898096, but -// still exists in the static preference list. Remove when upstream removes -// this or confirms it will not be used again in the future. -pref("browser.display.use_system_colors", false); // tor-browser#43366: do not use system accent color in inputs. // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1861362. pref("widget.non-native-theme.use-theme-accent", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/bc7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/bc7… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] fixup! Firefox preference overrides.
by henry (＠henry) 08 Jun '26

08 Jun '26

henry pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 7846ef4d by Henry Wilkes at 2026-06-08T16:11:54+00:00 fixup! Firefox preference overrides. BB 44857: Drop browser.display.use_system_colors. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -570,11 +570,6 @@ pref("pdfjs.disabled", false, locked); // tor-browser#43850. Keep forced colors off by default for all platforms. // Upstream sets a value of "0" for Windows. pref("browser.display.document_color_use", 1); -// Bug 40057: Ensure system colors are not used for CSS4 colors. -// FIXME: This preference seems to be unread since bugzilla bug 1898096, but -// still exists in the static preference list. Remove when upstream removes -// this or confirms it will not be used again in the future. -pref("browser.display.use_system_colors", false); // tor-browser#43366: do not use system accent color in inputs. // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1861362. pref("widget.non-native-theme.use-theme-accent", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7846ef4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7846ef4… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-152.0a1-16.0-2] fixup! BB 44711: Hide unwanted setting controls in Base Browser.
by henry (＠henry) 08 Jun '26

08 Jun '26

henry pushed to branch mullvad-browser-152.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: 83c5fe5c by Henry Wilkes at 2026-06-08T17:09:53+01:00 fixup! BB 44711: Hide unwanted setting controls in Base Browser. BB 45018: Add resistFingerprinting settings prior to importing other modules. Also, remove a stray "resistFingeprinting" Setting definition in privacy.mjs that should have been removed in the 152 rebase. - - - - - 2 changed files: - browser/components/preferences/config/privacy.mjs - browser/components/preferences/main.js Changes: ===================================== browser/components/preferences/config/privacy.mjs ===================================== @@ -3582,11 +3582,6 @@ Preferences.addSetting({ }, }); -Preferences.addSetting({ - id: "resistFingerprinting", - pref: "privacy.resistFingerprinting", -}); - Preferences.addSetting({ id: "resistFingerprintingPBM", pref: "privacy.resistFingerprinting.pbmode", ===================================== browser/components/preferences/main.js ===================================== @@ -39,6 +39,16 @@ ChromeUtils.defineESModuleGetters(this, { "resource://autofill/FormAutofillPreferences.sys.mjs", }); +// Rather than add "privacy.resistFingerprinting" preference and the +// "resistFingerprinting" Setting in privacy.mjs, we add them early *prior* to +// importing any config/ modules which require it. +// See tor-browser#44630 and tor-browser#45018. +Preferences.add({ id: "privacy.resistFingerprinting", type: "bool" }); +Preferences.addSetting({ + id: "resistFingerprinting", + pref: "privacy.resistFingerprinting", +}); + ChromeUtils.importESModule( "chrome://browser/content/preferences/config/accessibility.mjs", { global: "current" } @@ -93,10 +103,6 @@ function canShowAiFeature(featureSetting, defaultSetting) { } Preferences.addAll([ - // Rather than add "privacy.resistFingerprinting" in privacy.js, we add it - // early so we can define the "resistFingerprinting" `Setting` in this file. - // See below. See tor-browser#44630. - { id: "privacy.resistFingerprinting", type: "bool" }, // Startup { id: "browser.startup.page", type: "int" }, { id: "browser.startup.windowsLaunchOnLogin.enabled", type: "bool" }, @@ -129,18 +135,6 @@ if (AppConstants.HAVE_SHELL_SERVICE) { ]); } -// Rather than add "resistFingerprinting" in privacy.js, we add it to the -// settings early so we can have it be part of the setting config's `deps` field -// early. See tor-browser#44630. -// In particular, `Setting.deps` is lazy set. For many settings, this will only -// be set *after* all settings have been added. However, for settings with a -// `setup` field, the `deps` value will be set during construction, so we need -// the corresponding dependency available prior to construction. -Preferences.addSetting({ - id: "resistFingerprinting", - pref: "privacy.resistFingerprinting", -}); - Preferences.addSetting({ id: "privateBrowsingAutoStart", pref: "browser.privatebrowsing.autostart", View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/83c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/83c… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] fixup! BB 44711: Hide unwanted setting controls in Base Browser.
by henry (＠henry) 08 Jun '26

08 Jun '26

henry pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: c92588e8 by Henry Wilkes at 2026-06-08T16:06:41+00:00 fixup! BB 44711: Hide unwanted setting controls in Base Browser. BB 45018: Add resistFingerprinting settings prior to importing other modules. Also, remove a stray "resistFingeprinting" Setting definition in privacy.mjs that should have been removed in the 152 rebase. - - - - - 2 changed files: - browser/components/preferences/config/privacy.mjs - browser/components/preferences/main.js Changes: ===================================== browser/components/preferences/config/privacy.mjs ===================================== @@ -3580,11 +3580,6 @@ Preferences.addSetting({ }, }); -Preferences.addSetting({ - id: "resistFingerprinting", - pref: "privacy.resistFingerprinting", -}); - Preferences.addSetting({ id: "resistFingerprintingPBM", pref: "privacy.resistFingerprinting.pbmode", ===================================== browser/components/preferences/main.js ===================================== @@ -39,6 +39,16 @@ ChromeUtils.defineESModuleGetters(this, { "resource://autofill/FormAutofillPreferences.sys.mjs", }); +// Rather than add "privacy.resistFingerprinting" preference and the +// "resistFingerprinting" Setting in privacy.mjs, we add them early *prior* to +// importing any config/ modules which require it. +// See tor-browser#44630 and tor-browser#45018. +Preferences.add({ id: "privacy.resistFingerprinting", type: "bool" }); +Preferences.addSetting({ + id: "resistFingerprinting", + pref: "privacy.resistFingerprinting", +}); + ChromeUtils.importESModule( "chrome://browser/content/preferences/config/accessibility.mjs", { global: "current" } @@ -93,10 +103,6 @@ function canShowAiFeature(featureSetting, defaultSetting) { } Preferences.addAll([ - // Rather than add "privacy.resistFingerprinting" in privacy.js, we add it - // early so we can define the "resistFingerprinting" `Setting` in this file. - // See below. See tor-browser#44630. - { id: "privacy.resistFingerprinting", type: "bool" }, // Startup { id: "browser.startup.page", type: "int" }, { id: "browser.startup.windowsLaunchOnLogin.enabled", type: "bool" }, @@ -129,18 +135,6 @@ if (AppConstants.HAVE_SHELL_SERVICE) { ]); } -// Rather than add "resistFingerprinting" in privacy.js, we add it to the -// settings early so we can have it be part of the setting config's `deps` field -// early. See tor-browser#44630. -// In particular, `Setting.deps` is lazy set. For many settings, this will only -// be set *after* all settings have been added. However, for settings with a -// `setup` field, the `deps` value will be set during construction, so we need -// the corresponding dependency available prior to construction. -Preferences.addSetting({ - id: "resistFingerprinting", - pref: "privacy.resistFingerprinting", -}); - Preferences.addSetting({ id: "privateBrowsingAutoStart", pref: "browser.privatebrowsing.autostart", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c92588e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c92588e… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-152.0a1-16.0-2] fixup! BB 42758: Fix WebRTC build errors.
by jwilde (＠jwilde) 08 Jun '26

08 Jun '26

jwilde pushed to branch mullvad-browser-152.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: 3f659d9d by Pier Angelo Vendrame at 2026-06-08T15:08:35+00:00 fixup! BB 42758: Fix WebRTC build errors. MB 552: Fix WebRTC on mingw after the 152 rebase. - - - - - 1 changed file: - third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc Changes: ===================================== third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc ===================================== @@ -193,8 +193,7 @@ bool WgcCaptureSession::MayContainCursor() const { // IsCursorCaptureEnabled was introduced in IGraphicsCaptureSession2. // Default to true (cursor captured) if the interface is not available. ComPtr<ABI::Windows::Graphics::Capture::IGraphicsCaptureSession2> session2; - HRESULT hr = session_->QueryInterface( - ABI::Windows::Graphics::Capture::IID_IGraphicsCaptureSession2, &session2); + HRESULT hr = session_->QueryInterface(IID_PPV_ARGS(&session2)); if (FAILED(hr)) { return true; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/3f6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/3f6… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-152.0a1-16.0-2] fixup! BB 32308: Use direct browser sizing for letterboxing.
by morgan (＠morgan) 08 Jun '26

08 Jun '26

morgan pushed to branch mullvad-browser-152.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: 41215cfe by Henry Wilkes at 2026-06-08T14:42:03+00:00 fixup! BB 32308: Use direct browser sizing for letterboxing. BB 45017: CSS variable names for letterboxing. - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -997,7 +997,7 @@ class _RFPHelper { let colorRGBA; if (!verticalTabs) { lazy.logConsole.debug("Toolbar background used."); - colorRGBA = this._convertToRGBA(win, style, "--toolbar-bgcolor"); + colorRGBA = this._convertToRGBA(win, style, "--toolbar-background-color"); if (colorRGBA.a === 1) { return colorRGBA; } @@ -1027,7 +1027,7 @@ class _RFPHelper { lazy.logConsole.debug("Toolbox background used."); colorRGBA = this._composeRGBA( colorRGBA, - this._convertToRGBA(win, style, "--toolbox-bgcolor") + this._convertToRGBA(win, style, "--toolbox-background-color") ); if (colorRGBA.a === 1) { return colorRGBA; @@ -1040,7 +1040,11 @@ class _RFPHelper { // We use the theme's text colour to figure out whether the urlbar // background is overall meant to be light or dark. Unlike the urlbar, we // expect this colour to be (almost) opaque. - const textRGBA = this._convertToRGBA(win, style, "--toolbar-field-color"); + const textRGBA = this._convertToRGBA( + win, + style, + "--toolbar-field-text-color" + ); const textColor = new lazy.Color(textRGBA.r, textRGBA.g, textRGBA.b); if (textColor.relativeLuminance >= 0.5) { // Light text, so assume it has a dark background. @@ -1077,8 +1081,8 @@ class _RFPHelper { const verticalTabs = Services.prefs.getBoolPref(kPrefVerticalTabs); const chromeTextColorProperty = verticalTabs - ? "--toolbox-textcolor" - : "--toolbar-color"; + ? "--toolbox-text-color" + : "--toolbar-text-color"; const navbarStyle = win.getComputedStyle( win.document.getElementById("nav-bar") @@ -1099,10 +1103,10 @@ class _RFPHelper { // NOTE: In the default theme (no "lwtheme" attribute) with // browser.theme.native-theme set to false, --toolbar-field-color can be // set to "inherit", which means it will have a blank computed value. We - // fallback to --toolbar-color or --toolbox-textcolor in this case. + // fallback to --toolbar-text-color or --toolbox-text-color in this case. // Similarly, for windows OS, it can be set to "currentColor". urlbarTextRGBA = this._composeRGBA( - this._convertToRGBA(win, navbarStyle, "--toolbar-field-color", { + this._convertToRGBA(win, navbarStyle, "--toolbar-field-text-color", { fallbackProperty: chromeTextColorProperty, currentColorProperty: chromeTextColorProperty, }), View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/412… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/412… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] fixup! BB 32308: Use direct browser sizing for letterboxing.
by morgan (＠morgan) 08 Jun '26

08 Jun '26

morgan pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 43543c5a by Henry Wilkes at 2026-06-08T14:16:11+00:00 fixup! BB 32308: Use direct browser sizing for letterboxing. BB 45017: CSS variable names for letterboxing. - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -997,7 +997,7 @@ class _RFPHelper { let colorRGBA; if (!verticalTabs) { lazy.logConsole.debug("Toolbar background used."); - colorRGBA = this._convertToRGBA(win, style, "--toolbar-bgcolor"); + colorRGBA = this._convertToRGBA(win, style, "--toolbar-background-color"); if (colorRGBA.a === 1) { return colorRGBA; } @@ -1027,7 +1027,7 @@ class _RFPHelper { lazy.logConsole.debug("Toolbox background used."); colorRGBA = this._composeRGBA( colorRGBA, - this._convertToRGBA(win, style, "--toolbox-bgcolor") + this._convertToRGBA(win, style, "--toolbox-background-color") ); if (colorRGBA.a === 1) { return colorRGBA; @@ -1040,7 +1040,11 @@ class _RFPHelper { // We use the theme's text colour to figure out whether the urlbar // background is overall meant to be light or dark. Unlike the urlbar, we // expect this colour to be (almost) opaque. - const textRGBA = this._convertToRGBA(win, style, "--toolbar-field-color"); + const textRGBA = this._convertToRGBA( + win, + style, + "--toolbar-field-text-color" + ); const textColor = new lazy.Color(textRGBA.r, textRGBA.g, textRGBA.b); if (textColor.relativeLuminance >= 0.5) { // Light text, so assume it has a dark background. @@ -1077,8 +1081,8 @@ class _RFPHelper { const verticalTabs = Services.prefs.getBoolPref(kPrefVerticalTabs); const chromeTextColorProperty = verticalTabs - ? "--toolbox-textcolor" - : "--toolbar-color"; + ? "--toolbox-text-color" + : "--toolbar-text-color"; const navbarStyle = win.getComputedStyle( win.document.getElementById("nav-bar") @@ -1099,10 +1103,10 @@ class _RFPHelper { // NOTE: In the default theme (no "lwtheme" attribute) with // browser.theme.native-theme set to false, --toolbar-field-color can be // set to "inherit", which means it will have a blank computed value. We - // fallback to --toolbar-color or --toolbox-textcolor in this case. + // fallback to --toolbar-text-color or --toolbox-text-color in this case. // Similarly, for windows OS, it can be set to "currentColor". urlbarTextRGBA = this._composeRGBA( - this._convertToRGBA(win, navbarStyle, "--toolbar-field-color", { + this._convertToRGBA(win, navbarStyle, "--toolbar-field-text-color", { fallbackProperty: chromeTextColorProperty, currentColorProperty: chromeTextColorProperty, }), View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/43543c5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/43543c5… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] 4 commits: fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser
by morgan (＠morgan) 08 Jun '26

08 Jun '26

morgan pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: a422ad59 by Henry Wilkes at 2026-06-08T12:27:13+01:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 44844: Rename CSS urlbar variables. - - - - - 2d5c2b7d by Henry Wilkes at 2026-06-08T12:42:11+01:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 44844: Move CSS padding/margin variables to main CSS block. - - - - - 4ba77e17 by Henry Wilkes at 2026-06-08T12:43:32+01:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 44844: Use CSS nesting and use `:not(.tor-button)` rather than `.tor-urlbar-button-plain`. - - - - - 24ebfbb7 by Henry Wilkes at 2026-06-08T12:43:36+01:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 44844: Add an outline for forced colors, and change the plain button background when the urlbar has focus. - - - - - 2 changed files: - browser/components/torconnect/content/torConnectUrlbarButton.js - browser/themes/shared/tor-urlbar-button.css Changes: ===================================== browser/components/torconnect/content/torConnectUrlbarButton.js ===================================== @@ -141,7 +141,6 @@ var gTorConnectUrlbarButton = { !this._isActive || !TorConnect.canBeginNormalBootstrap || TorConnect.potentiallyBlocked; - this.button.classList.toggle("tor-urlbar-button-plain", plainButton); this.button.classList.toggle("tor-button", !plainButton); }, }; ===================================== browser/themes/shared/tor-urlbar-button.css ===================================== @@ -1,45 +1,84 @@ -.tor-urlbar-button:not([hidden]) { - display: flex; +.tor-urlbar-button { + &:not([hidden]) { + display: flex; + } align-self: stretch; align-items: center; gap: var(--space-small); border-radius: var(--urlbar-inner-border-radius); - --tor-urlbar-button-inline-padding: var(--space-small); - padding-inline: var(--tor-urlbar-button-inline-padding); - margin: 0; -} - -.tor-urlbar-button > * { - flex: 0 0 auto; - margin: 0; -} - -.tor-urlbar-button:focus-visible { - /* This button lies within the urlbar, so if the outline extends beyond the - * button's boundary, it will be clipped by the urlbar. - * Most button's in the urlbar get around this by using --focus-outline-inset, - * but our button has a purple background, which does not contrast well with - * the focus outline. - * Therefore, we use an offset outline rather than an inset outline, and - * compensate by shrinking the button's width and height so that the outline - * fits within the non-focused button boundary. Essentially, this has a - * similar effect to using an inset outline that matches the color of the - * urlbar background, but we keep the rounded corners. */ - outline: var(--focus-outline); - outline-offset: var(--focus-outline-offset); - /* Calculate the difference between the button's border area and the outline - * area. */ - --tor-urlbar-focus-outline-difference: calc(var(--focus-outline-offset) + var(--focus-outline-width)); + outline: var(--toolbarbutton-outline); + outline-offset: var(--toolbarbutton-outline-offset); + --tor-urlbar-focus-outline-difference: 0px; /* For the inline direction, we shrink the padding by the difference, and * increase the margin by the same amount so that the button text remains in * the same position. * For the block direction, the height of the button is flexibly sized with * the urlbar height, so we should only need to increase the margin. */ - padding-inline: calc(var(--tor-urlbar-button-inline-padding) - var(--tor-urlbar-focus-outline-difference)); + padding-inline: calc(var(--space-small) - var(--tor-urlbar-focus-outline-difference)); margin: var(--tor-urlbar-focus-outline-difference); + + &:focus-visible { + /* This button lies within the urlbar, so if the outline extends beyond the + * button's boundary, it will be clipped by the urlbar. + * Most button's in the urlbar get around this by using + * --focus-outline-inset, but our button has a purple background, which does + * not contrast well with the focus outline. + * Therefore, we use an offset outline rather than an inset outline, and + * compensate by shrinking the button's width and height so that the outline + * fits within the non-focused button boundary. Essentially, this has a + * similar effect to using an inset outline that matches the color of the + * urlbar background, but we keep the rounded corners. */ + outline-style: solid; + outline-width: var(--focus-outline-width); + outline-offset: var(--focus-outline-offset); + /* Calculate the difference between the button's border area and the outline + * area. */ + --tor-urlbar-focus-outline-difference: calc(var(--focus-outline-offset) + var(--focus-outline-width)); + } + + &:not(.tor-button) { + /* Make the button look plain like the identity .identity-box-button. */ + background-color: var(--urlbar-box-background-color); + color: var(--urlbar-box-text-color); + + :where(#urlbar[focused]) & { + background-color: var(--urlbar-box-background-color-focus); + } + + &:focus-visible { + outline-color: var(--focus-outline-color); + } + + &:hover { + background-color: var(--urlbar-box-background-color-hover); + color: var(--urlbar-box-text-color-hover); + outline-color: var(--toolbarbutton-outline-color-hover); + } + + &:hover:active { + background-color: var(--urlbar-box-background-color-active); + color: var(--urlbar-box-text-color-hover); + outline-color: var(--toolbarbutton-outline-color-active); + } + } + + &.tor-button:not(:focus-visible) { + /* Set the outline color based on a primary button. */ + outline-color: var(--button-border-color-primary); + + &:hover { + outline-color: var(--button-border-color-primary-hover); + } + + &:hover:active { + outline-color: var(--button-border-color-primary-active); + } + } } -.tor-urlbar-button:focus-visible > * { +.tor-urlbar-button > * { + flex: 0 0 auto; + margin-inline: 0; /* Negate the margin that would be added on focus to ensure the button does * not grow in height. * Ideally, this should not change anything noticeable, otherwise the text @@ -51,23 +90,3 @@ /* Hide whilst the user is typing in the url bar. */ display: none; } - -/* Make the button look plain like the identity #urlbar-label-box. */ -.tor-urlbar-button.tor-urlbar-button-plain { - background-color: var(--urlbar-box-bgcolor); - color: var(--urlbar-box-text-color); -} - -.tor-urlbar-button.tor-urlbar-button-plain:focus-visible { - outline-color: var(--focus-outline-color); -} - -.tor-urlbar-button.tor-urlbar-button-plain:hover { - background-color: var(--urlbar-box-hover-bgcolor); - color: var(--urlbar-box-hover-text-color); -} - -.tor-urlbar-button.tor-urlbar-button-plain:hover:active { - background-color: var(--urlbar-box-active-bgcolor); - color: var(--urlbar-box-hover-text-color); -} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9ee131… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9ee131… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0