September 2024 - tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] Bug 1862537 - Do not try to go back when it's a initial load...
by ma1 (＠ma1) 16 Sep '24

16 Sep '24

ma1 pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 13a575c8 by Roger Yang at 2024-09-16T22:28:43+02:00 Bug 1862537 - Do not try to go back when it's a initial load r=android-reviewers,harrisono, a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D219782 - - - - - 2 changed files: - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt - mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt Changes: ===================================== mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt ===================================== @@ -1120,10 +1120,13 @@ class GeckoEngineSession( return } - appRedirectUrl?.let { - if (url == appRedirectUrl) { - goBack(false) - return + // if it is an initial load then we can't go back. We should update the URL. + if (!initialLoad) { + appRedirectUrl?.let { + if (url == appRedirectUrl) { + goBack(false) + return + } } } ===================================== mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt ===================================== @@ -1049,6 +1049,7 @@ class GeckoEngineSessionTest { ) engineSession.settings.historyTrackingDelegate = historyTrackingDelegate engineSession.appRedirectUrl = emptyPageUrl + engineSession.initialLoad = false class MockHistoryList( items: List<GeckoSession.HistoryDelegate.HistoryItem>, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/13a575c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/13a575c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] Bug 1862537 - Do not try to go back when it's a initial load...
by morgan (＠morgan) 16 Sep '24

16 Sep '24

morgan pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 070534b9 by hackademix at 2024-09-16T21:37:26+02:00 Bug 1862537 - Do not try to go back when it's a initial load r=android-reviewers,harrisono, a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D219782 - - - - - 2 changed files: - android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt - android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt Changes: ===================================== android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt ===================================== @@ -869,9 +869,12 @@ class GeckoEngineSession( return GeckoResult.fromValue(false) } - appRedirectUrl?.let { - if (url == appRedirectUrl) { - return GeckoResult.fromValue(false) + // if it is an initial load then we can't go back. We should update the URL. + if (!initialLoad) { + appRedirectUrl?.let { + if (url == appRedirectUrl) { + return GeckoResult.fromValue(false) + } } } ===================================== android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt ===================================== @@ -968,6 +968,7 @@ class GeckoEngineSessionTest { ) engineSession.settings.historyTrackingDelegate = historyTrackingDelegate engineSession.appRedirectUrl = emptyPageUrl + engineSession.initialLoad = false class MockHistoryList( items: List<GeckoSession.HistoryDelegate.HistoryItem>, View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/070… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/070… 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] fixup! [android] Modify UI/UX
by morgan (＠morgan) 16 Sep '24

16 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 6922e094 by cypherpunks1 at 2024-09-16T19:11:44+00:00 fixup! [android] Modify UI/UX Bug 43052: Hide normal and synced tabs in the tabs tray - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt ===================================== @@ -50,6 +50,7 @@ import org.mozilla.fenix.compose.Divider import org.mozilla.fenix.compose.MenuItem import org.mozilla.fenix.compose.TabCounter import org.mozilla.fenix.compose.annotation.LightDarkPreview +import org.mozilla.fenix.ext.settings import org.mozilla.fenix.tabstray.ext.getMenuItems import org.mozilla.fenix.theme.FirefoxTheme import kotlin.math.max @@ -192,6 +193,7 @@ private fun TabPageBanner( onTabPageIndicatorClicked: (Page) -> Unit, onDismissClick: () -> Unit, ) { + val shouldDisableNormalMode = LocalContext.current.settings().shouldDisableNormalMode val selectedColor = FirefoxTheme.colors.iconActive val inactiveColor = FirefoxTheme.colors.iconPrimaryInactive var showMenu by remember { mutableStateOf(false) } @@ -216,22 +218,24 @@ private fun TabPageBanner( ) { CompositionLocalProvider(LocalRippleTheme provides DisabledRippleTheme) { TabRow( - selectedTabIndex = selectedPage.ordinal, + selectedTabIndex = if (shouldDisableNormalMode) 0 else selectedPage.ordinal, modifier = Modifier.fillMaxWidth(MAX_WIDTH_TAB_ROW_PERCENT), backgroundColor = Color.Transparent, contentColor = selectedColor, divider = {}, ) { - Tab( - selected = selectedPage == Page.NormalTabs, - onClick = { onTabPageIndicatorClicked(Page.NormalTabs) }, - modifier = Modifier - .fillMaxHeight() - .testTag(TabsTrayTestTag.normalTabsPageButton), - selectedContentColor = selectedColor, - unselectedContentColor = inactiveColor, - ) { - TabCounter(tabCount = normalTabCount) + if (!shouldDisableNormalMode) { + Tab( + selected = selectedPage == Page.NormalTabs, + onClick = { onTabPageIndicatorClicked(Page.NormalTabs) }, + modifier = Modifier + .fillMaxHeight() + .testTag(TabsTrayTestTag.normalTabsPageButton), + selectedContentColor = selectedColor, + unselectedContentColor = inactiveColor, + ) { + TabCounter(tabCount = normalTabCount) + } } Tab( @@ -250,6 +254,7 @@ private fun TabPageBanner( unselectedContentColor = inactiveColor, ) +/* Tab( selected = selectedPage == Page.SyncedTabs, onClick = { onTabPageIndicatorClicked(Page.SyncedTabs) }, @@ -265,6 +270,7 @@ private fun TabPageBanner( selectedContentColor = selectedColor, unselectedContentColor = inactiveColor, ) +*/ } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6922e09… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6922e09… 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] fixup! Firefox preference overrides.
by morgan (＠morgan) 16 Sep '24

16 Sep '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: cb96eb04 by Henry Wilkes at 2024-09-16T18:07:55+00:00 fixup! Firefox preference overrides. Bug 42777: Ensure non-privacy browsing also sets the GPC header. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -662,6 +662,11 @@ pref("privacy.query_stripping.enabled", true); pref("privacy.query_stripping.enabled.pbmode", true); pref("privacy.query_stripping.strip_on_share.enabled", true); +// Ensure global privacy control headers are consistent in private browsing and +// non-private browsing (tor-browser#42777). +pref("privacy.globalprivacycontrol.enabled", true); +pref("privacy.globalprivacycontrol.pbmode.enabled", true); + // Disable platform text recogniition functionality (tor-browser#42057) pref("dom.text-recognition.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/cb9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/cb9… 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] fixup! Firefox preference overrides.
by morgan (＠morgan) 16 Sep '24

16 Sep '24

morgan pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 5f0e5e21 by Henry Wilkes at 2024-09-16T18:07:18+00:00 fixup! Firefox preference overrides. Bug 42777: Ensure non-privacy browsing also sets the GPC header. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -666,6 +666,11 @@ pref("privacy.query_stripping.enabled", true); pref("privacy.query_stripping.enabled.pbmode", true); pref("privacy.query_stripping.strip_on_share.enabled", true); +// Ensure global privacy control headers are consistent in private browsing and +// non-private browsing (tor-browser#42777). +pref("privacy.globalprivacycontrol.enabled", true); +pref("privacy.globalprivacycontrol.pbmode.enabled", true); + // Disable platform text recogniition functionality (tor-browser#42057) pref("dom.text-recognition.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5f0e5e2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5f0e5e2… 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] fixup! Firefox preference overrides.
by morgan (＠morgan) 16 Sep '24

16 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 192b9bf7 by Henry Wilkes at 2024-09-16T18:02:12+00:00 fixup! Firefox preference overrides. Bug 42777: Ensure non-privacy browsing also sets the GPC header. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -666,6 +666,11 @@ pref("privacy.query_stripping.enabled", true); pref("privacy.query_stripping.enabled.pbmode", true); pref("privacy.query_stripping.strip_on_share.enabled", true); +// Ensure global privacy control headers are consistent in private browsing and +// non-private browsing (tor-browser#42777). +pref("privacy.globalprivacycontrol.enabled", true); +pref("privacy.globalprivacycontrol.pbmode.enabled", true); + // Disable platform text recogniition functionality (tor-browser#42057) pref("dom.text-recognition.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/192b9bf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/192b9bf… 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] fixup! MB 38: Mullvad Browser configuration
by morgan (＠morgan) 16 Sep '24

16 Sep '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 09e84f60 by Pier Angelo Vendrame at 2024-09-16T17:49:07+00:00 fixup! MB 38: Mullvad Browser configuration MB 344: Remove media.navigator.enabled = false on MB. RFP spoof the values protected by this preference. We do not do the same on Tor Browser because this functionality depends on WebRTC, which is disabled at build time on TBB. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -533,9 +533,6 @@ pref("media.peerconnection.ice.default_address_only", true); pref("media.peerconnection.ice.no_host", true); pref("media.peerconnection.ice.proxy_only_if_behind_proxy", true); -// Disables media devices but only if `media.peerconnection.enabled` is set to -// `false` as well. (see bug 16328 for this defense-in-depth measure) -pref("media.navigator.enabled", false); // GMPs (Gecko Media Plugins, https://wiki.mozilla.org/GeckoMediaPlugins) // We make sure they don't show up on the Add-on panel and confuse users. // And the external update/donwload server must not get pinged. We apply a View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/09e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/09e… 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: fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by morgan (＠morgan) 16 Sep '24

16 Sep '24

morgan pushed to branch tor-browser-115.15.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 15c91aa5 by Pier Angelo Vendrame at 2024-09-12T16:59:19+02:00 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 41835: Remove Twitter, Yahoo, and YouTube. - - - - - c5402ad1 by Pier Angelo Vendrame at 2024-09-12T16:59:20+02:00 fixup! Bug 41435: Add a Tor Browser migration function Bug: Review default search engine options. Migration code for removing Twitter, Yahoo, and YouTube from the local extension database. - - - - - 8 changed files: - browser/components/BrowserGlue.sys.mjs - − browser/components/search/extensions/twitter/favicon.ico - − browser/components/search/extensions/twitter/manifest.json - − browser/components/search/extensions/yahoo/favicon.ico - − browser/components/search/extensions/yahoo/manifest.json - − browser/components/search/extensions/youtube/favicon.ico - − browser/components/search/extensions/youtube/manifest.json - toolkit/components/search/SearchService.sys.mjs Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -4584,7 +4584,9 @@ BrowserGlue.prototype = { // torbutton preferences that are not used anymore. // Version 3: Tor Browser 13.0.7/13.5a3: Remove blockchair // (tor-browser#42283). - const TBB_MIGRATION_VERSION = 3; + // Version 4: Tor Browser 14.0a4 (2024-09-02), 13.5.4: Remove Twitter, Yahoo + // and YouTube search engines (tor-browser#41835). + const TBB_MIGRATION_VERSION = 4; const MIGRATION_PREF = "torbrowser.migration.version"; // If we decide to force updating users to pass through any version @@ -4636,21 +4638,26 @@ BrowserGlue.prototype = { } } } - if (currentVersion < 3) { - (async () => { + const dropAddons = async list => { + for (const id of list) { try { - const engine = await lazy.AddonManager.getAddonByID( - "blockchair(a)search.mozilla.org" - ); + const engine = await lazy.AddonManager.getAddonByID(id); await engine?.uninstall(); } catch {} - try { - const engine = await lazy.AddonManager.getAddonByID( - "blockchair-onion(a)search.mozilla.org" - ); - engine?.uninstall(); - } catch {} - })(); + } + }; + if (currentVersion < 3) { + dropAddons([ + "blockchair(a)search.mozilla.org", + "blockchair-onion(a)search.mozilla.org", + ]); + } + if (currentVersion < 4) { + dropAddons([ + "twitter(a)search.mozilla.org", + "yahoo(a)search.mozilla.org", + "youtube(a)search.mozilla.org", + ]); } Services.prefs.setIntPref(MIGRATION_PREF, TBB_MIGRATION_VERSION); ===================================== browser/components/search/extensions/twitter/favicon.ico deleted ===================================== Binary files a/browser/components/search/extensions/twitter/favicon.ico and /dev/null differ ===================================== browser/components/search/extensions/twitter/manifest.json deleted ===================================== @@ -1,26 +0,0 @@ -{ - "name": "Twitter", - "description": "Realtime Twitter Search", - "manifest_version": 2, - "version": "1.0", - "applications": { - "gecko": { - "id": "twitter(a)search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.ico" - }, - "web_accessible_resources": [ - "favicon.ico" - ], - "chrome_settings_overrides": { - "search_provider": { - "name": "Twitter", - "search_url": "https://twitter.com/search", - "search_form": "https://twitter.com/search?q={searchTerms}&partner=Firefox&source=desktop-s…", - "search_url_get_params": "q={searchTerms}&partner=Firefox&source=desktop-search" - } - } -} \ No newline at end of file ===================================== browser/components/search/extensions/yahoo/favicon.ico deleted ===================================== Binary files a/browser/components/search/extensions/yahoo/favicon.ico and /dev/null differ ===================================== browser/components/search/extensions/yahoo/manifest.json deleted ===================================== @@ -1,28 +0,0 @@ -{ - "name": "Yahoo", - "description": "Yahoo Search", - "manifest_version": 2, - "version": "1.0", - "applications": { - "gecko": { - "id": "yahoo(a)search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.ico" - }, - "web_accessible_resources": [ - "favicon.ico" - ], - "chrome_settings_overrides": { - "search_provider": { - "name": "Yahoo", - "search_url": "https://search.yahoo.com/yhs/search", - "search_form": "https://search.yahoo.com/yhs/search?p={searchTerms}&ei=UTF-8&hspart=mozilla", - "search_url_get_params": "p={searchTerms}&ei=UTF-8&hspart=mozilla", - "suggest_url": "https://search.yahoo.com/sugg/ff", - "suggest_url_get_params": "output=fxjson&appid=ffd&command={searchTerms}" - } - } -} ===================================== browser/components/search/extensions/youtube/favicon.ico deleted ===================================== Binary files a/browser/components/search/extensions/youtube/favicon.ico and /dev/null differ ===================================== browser/components/search/extensions/youtube/manifest.json deleted ===================================== @@ -1,26 +0,0 @@ -{ - "name": "YouTube", - "description": "YouTube - Videos", - "manifest_version": 2, - "version": "1.0", - "applications": { - "gecko": { - "id": "youtube(a)search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.ico" - }, - "web_accessible_resources": [ - "favicon.ico" - ], - "chrome_settings_overrides": { - "search_provider": { - "name": "YouTube", - "search_url": "https://www.youtube.com/results?search_query={searchTerms}&search=Search", - "search_form": "https://www.youtube.com/index", - "suggest_url": "https://suggestqueries.google.com/complete/search?output=firefox&ds=yt&q={s…" - } - } -} \ No newline at end of file ===================================== toolkit/components/search/SearchService.sys.mjs ===================================== @@ -2280,14 +2280,10 @@ export class SearchService { async _fetchEngineSelectorEngines() { const engines = [ { webExtension: { id: "ddg(a)search.mozilla.org" }, orderHint: 100 }, - { webExtension: { id: "youtube(a)search.mozilla.org" }, orderHint: 90 }, - { webExtension: { id: "google(a)search.mozilla.org" }, orderHint: 80 }, - { webExtension: { id: "ddg-onion(a)search.mozilla.org" }, orderHint: 70 }, - { webExtension: { id: "startpage(a)search.mozilla.org" }, orderHint: 60 }, - { webExtension: { id: "startpage-onion(a)search.mozilla.org" }, orderHint: 50 }, - { webExtension: { id: "twitter(a)search.mozilla.org" }, orderHint: 40 }, - { webExtension: { id: "wikipedia(a)search.mozilla.org" }, orderHint: 30 }, - { webExtension: { id: "yahoo(a)search.mozilla.org" }, orderHint: 20 }, + { webExtension: { id: "ddg-onion(a)search.mozilla.org" }, orderHint: 90 }, + { webExtension: { id: "startpage(a)search.mozilla.org" }, orderHint: 80 }, + { webExtension: { id: "startpage-onion(a)search.mozilla.org" }, orderHint: 70 }, + { webExtension: { id: "wikipedia(a)search.mozilla.org" }, orderHint: 60 }, ]; for (let e of engines) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8eb0e1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8eb0e1… 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] squash! Bug 41043: Hardcode the UI font on Linux
by morgan (＠morgan) 16 Sep '24

16 Sep '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: b3c475ab by Pier Angelo Vendrame at 2024-09-16T17:42:36+00:00 squash! Bug 41043: Hardcode the UI font on Linux Bug 43141: Hardcode system-ui to Arimo. - - - - - 2 changed files: - gfx/thebes/gfxPlatformFontList.cpp - layout/base/nsLayoutUtils.cpp Changes: ===================================== gfx/thebes/gfxPlatformFontList.cpp ===================================== @@ -2055,6 +2055,11 @@ static void GetSystemUIFontFamilies(const nsPresContext* aPresContext, #if defined(XP_MACOSX) || defined(MOZ_WIDGET_UIKIT) *aFamilies.AppendElement() = "-apple-system"_ns; return; +#elif defined(MOZ_WIDGET_GTK) + // tor-browser#43141: Hardcode Arimo in case our custom fontconfig is + // missing. + *aFamilies.AppendElement() = "Arimo"_ns; + return; #elif !defined(MOZ_WIDGET_ANDROID) *aFamilies.AppendElement() = "sans-serif"_ns; return; ===================================== layout/base/nsLayoutUtils.cpp ===================================== @@ -9720,7 +9720,9 @@ static void GetSpoofedSystemFontForRFP(LookAndFeel::FontID aFontID, // In general, Linux uses some sans-serif, but its size can vary between // 12px and 16px. We chose 15px because it is what Firefox is doing for the // UI font-size. - aName = u"sans-serif"_ns; + // tor-browser#43141: Hardcode Arimo in case our custom fontconfig is + // missing. + aName = u"Arimo"_ns; aStyle.size = 15; #else # error "Unknown platform" View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/b3c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/b3c… 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] squash! Bug 41043: Hardcode the UI font on Linux
by morgan (＠morgan) 16 Sep '24

16 Sep '24

morgan pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: cfed101d by Pier Angelo Vendrame at 2024-09-16T17:42:17+00:00 squash! Bug 41043: Hardcode the UI font on Linux Bug 43141: Hardcode system-ui to Arimo. - - - - - 2 changed files: - gfx/thebes/gfxPlatformFontList.cpp - layout/base/nsLayoutUtils.cpp Changes: ===================================== gfx/thebes/gfxPlatformFontList.cpp ===================================== @@ -2055,6 +2055,11 @@ static void GetSystemUIFontFamilies(const nsPresContext* aPresContext, #if defined(XP_MACOSX) || defined(MOZ_WIDGET_UIKIT) *aFamilies.AppendElement() = "-apple-system"_ns; return; +#elif defined(MOZ_WIDGET_GTK) + // tor-browser#43141: Hardcode Arimo in case our custom fontconfig is + // missing. + *aFamilies.AppendElement() = "Arimo"_ns; + return; #elif !defined(MOZ_WIDGET_ANDROID) *aFamilies.AppendElement() = "sans-serif"_ns; return; ===================================== layout/base/nsLayoutUtils.cpp ===================================== @@ -9720,7 +9720,9 @@ static void GetSpoofedSystemFontForRFP(LookAndFeel::FontID aFontID, // In general, Linux uses some sans-serif, but its size can vary between // 12px and 16px. We chose 15px because it is what Firefox is doing for the // UI font-size. - aName = u"sans-serif"_ns; + // tor-browser#43141: Hardcode Arimo in case our custom fontconfig is + // missing. + aName = u"Arimo"_ns; aStyle.size = 15; #else # error "Unknown platform" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cfed101… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cfed101… You're receiving this email because of your account on gitlab.torproject.org.

1 0