Skip to content

TB 43415: Rebased onto 134.0a1

Merge Info

Issues

Resolves

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

Related

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

  • 53621bf1... BB 43322: Customize the font visibility lists.
    • gfx/thebes/gfxMacPlatformFontList.mm: our patch was built upon some upstream changes that were actually added during 134, hence the conflicts.
  • f84292ec... BB 42288: Allow language spoofing in status messages.
    • Upstream moved uriloader/base/nsDocLoader.cpp to Fluent, so I dropped our changes there.
  • f525e9c1... BB 40925: Implemented the Security Level component
    • Upstream removed the purpose param from getSubmission (toolkit/components/search/SearchEngine.sys.mjs)
  • 00491c58... TB 40032 [android]: Set usesCleartextTraffic as false
    • Upstream added android:enableOnBackInvokedCallback="true" to mobile/android/fenix/app/src/main/AndroidManifest.xml, not sure if it changes anything for us
  • 4425096f... [android] Modify UI/UX
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt:
      • upstream added stuff to cookies protection, to review: Bug 1914664 (27cc801f)
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt:
      • upstream updated addToHomeScreenItem (which we comment, so I commented the new version)
      • they also added addAppToHomeScreenItem, but I guess it's not a big deal? Probably need to review it (Bug 1906681, eadcbccb)
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/SaveSubmenu.kt
      • now we have two calls to FxSuggestSuggestionProvider, conditioned on activity.settings().boostAmpWikiSuggestions
    • mobile/android/fenix/app/src/main/res/layout/fenix_snackbar.xml
      • removed in Bug 1814198 (4ff1ca5c)
      • TODO: check if we have to do customizations on a new file instead
      • opened #43694
  • aaf7157f... [android] Implement Android-native Connection Assist UI
    • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt:
      • we should check the onBackPressedDispatcher
      • bonuses to fix build failures:
        • I had to comment the call to FenixSnackbar.make, as FenixSnackbar was deleted (#43694)
        • upstream now imports org.mozilla.fenix.home.HomeFragment, so I deleted our import
  • bfa83922... [android] TB 43351: Add function to disable forcing ALL CAPS for the fenix snackbar action button text
    • Dropped, as the snackbar has been refactored.

How Tested

Range-diff and built for Linux+Android.

Edited by Pier Angelo Vendrame

Merge request reports

Loading