Skip to content

BB/TB 43418: Rebased onto 137.0a1

Pier Angelo Vendramerequested to merge
pierov/tor-browser:43418-rebase-137 into tor-browser-137.0a1-15.0-1

Merge Info

Issues

Resolves

Related

  • tor-browser#xxxxx
  • mullvad-browser#xxxxx
  • tor-browser-build#xxxxx

Merging

Target Branches

  • tor-browser - !fixups to tor-browser-specific commits, new features, security backports
  • base-browser and mullvad-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
    • ⚠️ IMPORTANT: Please list the base-browser-specific commits which need to be cherry-picked to the base-browser and mullvad-browser branches here

Target Channels

  • Alpha: esr128-14.5
  • Stable: esr128-14.0
  • Legacy: esr115-13.5

Backporting

Timeline

  • No Backport (preferred): patchset for the next major stable
  • Immediate: patchset needed as soon as possible (fixes CVEs, 0-days, etc)
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport

(Optional) Justification

  • Security update: patchset contains a security fix (be sure to select the correct item in Timeline)
  • Censorship event: patchset enables censorship circumvention
  • Critical bug-fix: patchset fixes a bug in core-functionality
  • Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
  • Sponsor required: patchset required for sponsor
  • Localization: typos and other localization changes that should be also in the release branch
  • Other: please explain

Upstream

  • Patchset is a candidate for uplift to Firefox
  • Patchset is a backport from Firefox
    • Bugzilla link:
    • Upstream commit:

Issue Tracking

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since Gitlab only allows 1 reviewer)
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • ci/cd: brizental, henry
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, morgan
    • localization : henry, pierov
    • macOS : clairehurst, dan
    • nightly builds : boklm
    • rebases/release-prep : brizental, clairehurst, dan, ma1, pierov, morgan
    • security : jwilde, ma1
    • signing : boklm, morgan
    • updater : pierov
    • windows : jwilde, morgan
    • misc/other : pierov, morgan

Change Description

Rebase 1: on top of ab159ae9.

  • BB 21431: Clean-up system extensions shipped in Firefox
    • browser/extensions/moz.build: newtab is now a built-in extension, it might make sense to have a look at this.
    • The specific conflicting commit is 04d347ec (Bug 1938452)
  • TB 40032 [android]: Set usesCleartextTraffic as false
    • mobile/android/fenix/app/src/main/AndroidManifest.xml: more changes for enableOnBackInvokedCallback. However, we already have an issue about this.
  • TB 40016 [android]: Don't install WebCompat webext.
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt: reportBrokenSite is now conditioned by shouldShowWebCompatReporter. Maybe we can simplify our patches.
    • TODO: open an audit for Bug 1944084 (the conflicting commit is 69e9bba8)

HEAD: 8480111ca924514ca4c752d041422d104e07d3b7

Rebase 2: on top of a2fce207.

  • BB 43101: Deep link to the startup security warning explanation.
  • BB 42831: Remove the shopping components.
  • BB 41635: Disable the Normandy component
  • BB 41434: Letterboxing, improve logging.
  • BB 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs.
  • BB 32308: Use direct browser sizing for letterboxing.
    • Partially uplifted. We need to check how we're doing.
    • Switched to nested CSS
  • BB 41631: Prevent weird initial window dimensions caused by subpixel computations
    • Conflicts with the partial uplifts.
  • BB 31575: Disable Firefox Home (Activity Stream)
    • BrowserGlue stuff
    • browser/components/newtab/AboutNewTabService.sys.mjs: change of URL because of the switch of newtab to an extension
    • FIXME: rebase again and remove ASRouterNewTabHook from BrowserComponents.manifest
  • [android] Modify add-on support
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt: GeckoEngine(...).also {} modified upstream... Restored the .also part.
  • [android] Disable features and functionality
    • mobile/android/fenix/app/build.gradle: printlns have been changed with project.logger.debug
  • TB 40016 [android]: Don't install WebCompat webext.
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt: seems WebCompat stuff has been removed upstream? Completely removed, not moved
    • Bug 1944364 (0e9d7580)
  • [android] Modify UI/UX
    • mobile/android/android-components/components/feature/awesomebar/src/main/java/mozilla/components/feature/awesomebar/provider/SessionSuggestionProvider.kt: upstream removed result.content.private, and moved icons?.loadIcon in the file
    • TODO: open an issue to audit Bug 1945065 (d26fb0a5)
  • TB 40041 [android]: Implement Tor Network Settings
    • mobile/android/fenix/app/src/main/res/xml/preferences.xml: upstream added android:key="@string/pref_key_privacy_security_category" where we used to add android:key="@string/pref_key_privacy".
    • Maybe we can drop a string? (assuming it was ours)
    • TODO: open an issue to audit Bug 1938500 (59b26bae). Should cc UX

Rebase 3: on top of FIREFOX_NIGHTLY_137_END

  • [android] Disable features and functionality
    • mobile/android/fenix/app/build.gradle: upstream removed implementation FenixDependencies.adjust, I tried to update what we do, I hope it works.
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt: we probably want to remove trendingSearchSuggestionsPreference and hardcode it to disabled. Added it in Bug 1945632 (613baf9f)
    • mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt deleted, we'll need to audit Bug 1949260 (5ac5fd04)
  • TB 34403 [android]: Disable Normal mode by default.
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt: more conflicts due to the addition of the trending search suggestions

How Tested

Related to #43418 (closed)

Edited by Pier Angelo Vendrame

Merge request reports