Evaluate RR version-by-RR version rebases instead of ESR-to-ESR

assigned to @pierov

116

This is in sync with tor-browser-115.8.0esr-13.5-1-build1 (the tag, because continuously cherry-picking in all the versions would have been too much work).

My guess is that this version contained all the stuff that Mozilla didn't want in the ESR already, so it was bigger than others.

My branch for it is tor-browser-116-13.5.

Base commit: ff486626d0de0e7f34d65ef000c657080ddf564d.

Rebase log

`browser/app/permissions`

I don't know what's wrong with this, but I had a conflict we had already fixed in 115?!

Git really hates this change we did, and kept asking be about it.

`services/settings/dumps/main/moz.build`

Added the new translation stuff, just kept it for now, and we should recheck remote settings in the future.

`layout/generic/test/mochitest.ini`

We append at the end of the file, and we get numerous conflicts because of this.

BrowserGlue

New SpeechDispatcher actor, some stuff has been esmified.

The old translation (which followed about:torconnect) has actually been removed.

The TorConnect actor should be removed in the correct commit in 115.

`toolkit/content/widgets/moz-support-link/moz-support-link.mjs`

The commit that was already backported to ESR115, but only after the release, or something like that (b09399d46c8525007ee0a67853175bfb7a293a4a).

`toolkit/components/search/SearchService.sys.mjs`

We remove a bunch of stuff, I've reapplied our patch.

It might have been a problem with a changed order in the import statements.

`dom/html/HTMLFormElement.cpp`

d4e5590f4076347e35b73db96ea3b7c543f9e3b7 refactored the way of checking HTTPS in forms.

Solution: drop our patch for now, and we should restore it later.

`mobile/android/app/mobile.js`

app.update.url.android was removed in f0c3ad095a44780e4957236341f13a8f27af9a44. Nice.

`mobile/android/components/geckoview/GeckoViewStartup.sys.mjs`

It's been esmified! ️

`toolkit/mozapps/extensions/content/aboutaddons.html`

Upstream fixed some accessibility in fff1c96de6f1546b34b5c7e13df0784e6a988ae2. This caused a conflict in where our patch added the code, but the patch itself isn't affected (maybe we could check if we should update it, though).

`browser/base/content/main-popupset.inc.xhtml`

Upstream removed the inclusion of ../../../devtools/startup/enableDevToolsPopup.inc.xhtml, which was just before the line we add.

`toolkit/content/widgets/message-bar.css`

Upstream moved the background gradient to @media not (prefers-contrast).

TODO: Ask UX people if it's okay.

`toolkit/content/license.html`

Upstream removed a license after the one we add in crypto safety. Range-diff is very confused by this changed ️, but it seems to me I got it right.

`browser/components/preferences/main.inc.xhtml`

We removed the big block of network preferenes, maybe something has changed there, but since we don't care of that block I've just removed it again.

From the range-diff, this seems to be the only difference:

    --              connection-proxy-autologin.label,
    +-              connection-proxy-autologin-checkbox.label,

`browser/modules/URILoadingHelper.sys.mjs`

Some conflict in lazy defines because of some upstream esmification.

BTW, we still mention the red about:tor, which isn't a thing anymore ️.

`toolkit/actors/NetErrorParent.sys.mjs`

Also some esmification.

`browser/base/content/browser-places.js`

More esmification.

`netwerk/protocol/http/HttpBaseChannel.cpp`

Now upstream checks RFPTarget::HttpUserAgent.

`browser/base/content/browser.js`

Some esmification. Also, took the occasion of using the OnionLocationParent as es module, rather than old module (I must have missed this when moving to ESM modules).

TODO: Check the patchset if we still use jsm where we could use mjs.

`browser/modules/moz.build`

More modules.

`browser/components/downloads/content/downloads.js`

The _state member has been reworked.

117

This rebase is also in sync with tor-browser-115.8.0esr-13.5-1-build1.

My branch for it is tor-browser-117-13.5.

Base commit: 1b3efa594736dc2cace8f92611707e876a66fba6.

Rebase log

`dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-win32.c`

250a15682f45ebd60ece61667d32e6a3990f3d94 removed XP stuff, introducing a conflict in one of our WebRTC patches.

`browser/themes/shared/preferences/preferences.css`

7e60f84b6ec7c303e07f303a4838e907265a9a05 removes pre-Windows 10 media queries, and we modified one of them to hide the Windows SSO.

TODO: Verify the patch still works as expected.

`browser/base/content/browser.xhtml`

New JS where we used to add the one for the language bar.

Also, chrome://browser/skin/browser-aero.css was removed (not a conflict with our code, but still interesting).

`toolkit/modules/UpdateUtils.sys.mjs`

formatUpdateURL was refactored. Luckily, we changed only one line there, so it was easy to adapt it to the new refactor.

`browser/base/content/browser.js`

14ad5f1a886d7a8b1265659797e9d1ef0c50e825 refactored the OpenBrowserWindow function.

Moved that part of the patch to browser/modules/BrowserWindowTracker.sys.mjs.

TODO: Verify it still makes sense.

`toolkit/content/license.html`

Moar license nonsense.

`browser/components/places/PlacesUIUtils.sys.mjs`

XPCOMUtils changed with ChromeUtils.

`browser/base/content/browser-places.js`

The argument of isOnNewTabPage is not only a currentURI value, but it is a normal variable called uri. It seems that it's the same, rather than having to use uri.currentURI.

Changed in commit 249d76638642dc052b144bf45461c5c14af46af7.

`docshell/base/nsAboutRedirector.cpp`

New about page (crashextensions).

`browser/components/BrowserGlue.sys.mjs`

Conflicts because XPCOMUtils have been changed to ChromeUtils in many parts of the file.

TODO: Check if we need to do the same in some of our patches.

`browser/components/about/components.conf`

New about page enabled only in nightly builds (shoppingsidebar).

`modules/libpref/init/StaticPrefList.yaml`

A few new privacy. preferences.

`toolkit/modules/RemotePageAccessManager.sys.mjs`

New permissions for about:shoppingsidebar.

118

This rebase is also in sync with tor-browser-115.8.0esr-13.5-1-build1.

My branch for it is tor-browser-118-13.5.

Base commit: 281ea239d30c6fa22254b074cb9a06d909802cb1.

Rebase log

`mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java`

New settings between where we added the spoof English one and the previous one.

`browser/components/BrowserGlue.sys.mjs`

New lazy.ShoppingUtils.uninit before where we remove lazy.ASRouterNewTabHook.destroy.

New actors for AboutWelcomeShopping.

Bug 1839426 added an uninit thing.

`toolkit/mozapps/update/UpdateService.sys.mjs`

New UpdateLog module.

`browser/components/preferences/privacy.js`

New "Global Privacy Control" thingie.

`toolkit/mozapps/extensions/AddonManager.sys.mjs`

Maybe the new PREF_USE_REMOTE.

119

This rebase is also in sync with tor-browser-115.8.0esr-13.5-1-build1.

My branch for it is tor-browser-119-13.5.

Base commit: 32855b82e4f84848c92a9ce46a4f62c58bbd3b10.

Rebase log

`browser/app/permissions`

The code we delete has been changed in 25d84b79059a4b0ae1ebd879ab2dd7f36dbd1c20.

`browser/components/search/SearchSERPTelemetry.sys.mjs`

There's a new settings key: TELEMETRY_CATEGORIZATION_KEY. TODO: Check the patch and delete the additional telemetry client.

Or, even better, completely patch the remote settings client.

TODO: Remove the temporary patch I added and use the new preference that controls it (CATEGORIZATION_PREF in the same file).

`browser/base/content/browser.xhtml`

shopping-sidebar.js isn't a nightly feature anymore.

`toolkit/components/resistfingerprinting/RFPHelper.sys.mjs`

javascript.use_us_english_locale removed.

TODO: Verify what this implies.

`browser/components/BrowserGlue.sys.mjs`

ShoppingUtils not nightly-only anymore.

`xpcom/io/CocoaFileUtils.mm`

I'd say Moz changed the linter/formatter for Objective C++ (many indentation changes). It seems it's 9331b9fb073cb2ca31fe508fd69c0702f34db89f.

`browser/components/about/components.conf`

Another conflict due to shoppingsidebar.

`modules/libpref/init/StaticPrefList.yaml`

browser.underline_anchors was removed.

`security/manager/ssl/StaticHPKPins.h`

The general cleanup that Mozilla did of the pins.

`toolkit/content/widgets/moz-toggle/moz-toggle.mjs`

The stylesheet is now hardcoded.

I lost the removal of this line in BrowserGlue.sys.mjs:

    lazy.AboutNewTab.init();

Not a big deal, but all the following rebases will include this line.

I'm removing it in the branch for 127, rather than go through all the branch in the middle.

120

This rebase is also in sync with tor-browser-115.8.0esr-13.5-1-build1.

My branch for it is tor-browser-120-13.5.

Base commit: 2286d3197e38e12030730095c3963015f2f940d5.

Rebase log

`browser/components/search/SearchSERPTelemetry.sys.mjs`

New lazy import for PrivateBrowsingUtils.

`services/settings/dumps/main/moz.build`

New dump file: search-config-v2.json.

`toolkit/components/search/SearchService.sys.mjs`

#setupRemoteSettings seems to have been renamed to #getIgnoreListAndSubscribe. There was a general refactor in 91ba1cb671d238c90f15bec3a4ad0ba7e3ae6f14.

`browser/components/BrowserContentHandler.sys.mjs`

Conflicts because of 9e7b132bbbb6caf3a8b69ebf6bc8345097c9497f.

TODO: Check if this patch is still needed with the threat model changes.

`browser/themes/shared/browser-shared.css`

New stylesheet included (chrome://browser/skin/formautofill-notification.css).

`mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java`

Some changes upstream close to where we define mSpoofEnglish.

`layout/generic/test/mochitest.ini`

Mozilla refactored the various mochitest.ini and renamed them to TOML files. See 0cb91fe33e4ad088bd2babe321fc0da49ceca9a3.

I've tried to add the test to mochitest.toml, but I'm not sure it works. Anyway, we don't run the tests, and that particular test (the one for the line-height compensation) is probably broken anyway these days.

`dom/base/nsCopySupport.cpp`

This feature is now gated behind StaticPrefs::clipboard_imageAsFile_enabled(). See 3b1a417bd3d614c198de708eb5237ef441faac58.

TODO: Drop the patch (Bug 33955) and set the pref instead. ️

`browser/components/BrowserGlue.sys.mjs`

Upstream added a new init (ResetPBMPanel) after SaveToPocket's.

`toolkit/mozapps/update/updater/updater.cpp`

A few commits there between 119 and 120 (with some improved logging and a memory leak fixed, thanks Mozilla!).

It seems a couple fprintfs to stderr were changed to LOG around where we patched stuff.

TODO: Check what this means for the post update stuff in Mullvad Browser!

Also, a new else branch has been added at a certain point just for some logging. I left it, but I'm not sure it will compile at the first attempt.

`browser/base/content/browser.xhtml`

No more XML stylesheets (be1eb3c4b85b918cd991fcc68c0f92da1e80ce6d)! ️

However, this also screwed with our DTD translations (hope to get rid of them very soon! ️).

`browser/components/preferences/preferences.xhtml`

Also XML stylesheets.

`browser/components/preferences/privacy.js`

New this._initThirdPartyCertsToggle(); checkbox.

TODO: This is very interesting. We should have a look at it. Maybe this means nocertdb is finally split from that feature.

`browser/base/content/hiddenWindowMac.xhtml`

Doctype/XML stylesheet conflict.

`browser/base/content/pageinfo/pageInfo.xhtml`

Same.

`browser/components/places/content/places.xhtml`

Same.

`browser/components/shell/content/setDesktopBackground.xhtml`

Same (but is this still needed?).

`browser/base/content/aboutDialog.xhtml`

Another DTD/XML stylesheet conflict.

`mobile/android/app/geckoview-prefs.js`

We append at the end of the file, and the previous content changed, hence the conflict.

In general, there was a big refactor and mobile.js has been removed in e1c08f9fbf3671467151c6aa8cbbee39c21f9d74. We might have to audit this a little bit more.

`mobile/android/app/moz.build`

mobile.js was removed.

Various locales in Amazon search engines

We delete these files, but they changed upstream. I kept deleting them.

`dom/websocket/WebSocket.cpp`

A comment changed where we check IsPotentiallyTrustworthyOnion. I don't like this patch, it becomes quite hard to understand, which isn't something we should do with security patches!!!

TODO: Refactor that part of the patch.

`xpcom/base/ErrorList.py`

Okay, I didn't know we patched also this file. It seems Firefox has a mechanism to add errors with a certain binary mask, probably in the most significant bits. We used 45 as a mod, but upstream set it for the default browser agent (!), so I updated our Tor codes to use mod 46.

TODO: Check if this means anything for default browser in Mullvad Browser.

`toolkit/content/widgets/moz-toggle/moz-toggle.mjs`

Mozilla removed labelTemplate(), and extracted the button code from render() to a function on its own.

TODO: We'll have to double check how to re-implement the labelAlignAfter functionality ️.

121

This rebase is also in sync with tor-browser-115.8.0esr-13.5-1-build1.

My branch for it is tor-browser-121-13.5.

Base commit: 2b0d4f47383233a8b48f2b2d5aa4a0f24770baa3.

Rebase log

`browser/components/aboutlogins/AboutLoginsParent.sys.mjs`

New line (preselectedLogin: this.preselectedLogin) before one we add.

`browser/components/search/SearchSERPTelemetry.sys.mjs`

Download changes happened in b4ae989be0618fd1285f206eac3fdf22bd00aa88.

I don't think it makes sense to try to remove the calls to RemoteSettings. Instead, we should mock another client that uses cached dumps. It is a much smarter approach to this. So, I just added a couple of early-returns that will break linting.

TODO: Check this patch once again, and possibly dump RemoteSettings in a cleverer way.

`mobile/android/geckoview/api.txt`

A couple of conflicts where we add our new entries for spoof English and security level.

I don't think we really need to populate this file.

`browser/components/BrowserGlue.sys.mjs`

about:plugins has gone ️ (Bug 747301).

`toolkit/modules/RemotePageAccessManager.sys.mjs`

Also removal of about:plugins.

`browser/base/content/main-popupset.inc.xhtml`

New include in the panel: ../../components/reportbrokensite/content/reportBrokenSitePanel.inc.xhtml.

Also, I noticed panel-footer-button was changed to footer-button (not sure we need to change anything on our code).

`toolkit/modules/ActorManagerParent.sys.mjs`

New ReportBrokenSite entry before our TorConnect entry.

`browser/base/content/browser-siteIdentity.js`

warnTextOnInsecure has been moved earlier in the function.

The _isMixedActiveContentLoaded case (line 880 as of the Bug 23247 commit) has changed and added the following case:

        if (UrlbarPrefs.get("trimHttps") && warnTextOnInsecure) {
          icon_label = gNavigatorBundle.getString("identity.notSecure.label");
          this._identityBox.classList.add("notSecureText");
        }

TODO: Investigate this.

`security/certverifier/CertVerifier.cpp`

It's #42334 (closed)/Bug 1611381 again.

`browser/base/content/navigator-toolbox.inc.xhtml`

Removed <stack id="plugins-notification-icon" that was just below our addition (again plugins stuff).

added Doing label

122

In this rebase I switched from tor-browser-115.8.0esr-13.5-1-build1 (tor-browser-122-13.5-1) to tor-browser-115.9.0esr-13.5-1-build1.

In tor-browser-122-13.5-2 I squashed the various commits according the usual rules and added the new ones at the end of the branch, and in tor-browser-122-13.5-3 I moved the new commits to the expected positions.

Base commit: 3d7f487b56c7d78c380072eacb51a7d0ad736e39.

Rebase log

`toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp`

Bug 41149

The feature is now gated with a new macro (BLOCK_LOADLIBRARY_INJECTION).

TODO: Check if we can update mozconfigs and simplify our patch.

`services/settings/dumps/main/moz.build`

Bug 31740: Remove some unnecessary RemoteSettings instances

New file: search-config-overrides.json. Removed for now.

TODO: Check these files again and if we can simplify this patch.

`mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java`

Bug 30605: Honor privacy.spoof_english in Android

New plumbing for "global privacy control" creates a small conflict.

`browser/components/BrowserGlue.sys.mjs`

Bug 31575: Disable Firefox Home (Activity Stream)

There's a new about:asrouter in LightweightTheme.matches. I will leave it for now, because even though we remove the page, it's probably fine to leave. (Not a conflict in any case).

We remove some blocks, there were a couple of changes in those blocks, as you can easily see in the range-diff.

`toolkit/xre/nsUpdateDriver.cpp`

Bug 4234: Use the Firefox Update Process for Base Browser.

In this difficult case, I tried to reapply upstream's changes instead of ours.

git diff 2b0d4f47383233a8b48f2b2d5aa4a0f24770baa3..3d7f487b56c7d78c380072eacb51a7d0ad736e39 -- toolkit/xre/nsUpdateDriver.cpp

Then I ran diff of diff on the single commit to check whether we've lost anything.

I lost these comments, but I think it's fine:

+// We need to detect whether elevation is required for this update. This can
+// occur when an admin user installs the application, but another admin
+// user attempts to update (see bug 394984).

Notice that the if condition changed, so I had to update our patch as well.

In general, the relevant changes were due to the change of UpdateDriverSetupMacCommandLine.

`browser/base/content/main-popupset.inc.xhtml`

Bug 40925: Implemented the Security Level component

It seems this line has been removed upstream:

#include ../../components/reportbrokensite/content/reportBrokenSitePanel.inc.xhtml

Bug 41600: Add a tor circuit display panel.

Same.

`browser/branding/branding-common.mozbuild`

Bug 2176: Rebrand Firefox to TorBrowser

I think some linting has happened, because all ' have been changed to ".

TODO: Do we still need the default256.png on Linux?

`browser/components/moz.build`

Bug 7494: Create local home page for TBB.

Two new components: "aboutwelcome", "asrouter".

TODO: Check if we need to remove these entries in the appropriate commit.

`toolkit/toolkit.mozbuild`

Bug 12620: TorBrowser regression tests

File linted upstream.

When cherry-picking

`browser/locales/jar.mn`

The addition of ../locales-preview/base-browser-no-translate.ftl conflicts.

`toolkit/components/windowwatcher/nsWindowWatcher.cpp`

Bug 41918 changes a part with nsContentUtils::ShouldResistFingerprinting that includes some documentation in the upstream version.

`xpfe/appshell/AppWindow.cpp`

Also Bug 41918, also because of RFPTarget in ShouldResistFingerprinting.

`widget/windows/WinTaskbar.cpp`

Upstream removed their useProfile variable we were updating. Added it back again.

`browser/components/migration/ChromeMigrationUtils.sys.mjs`

Interesting, upstream has a patch similar to mine, but for SNAP_REAL_HOME. I slightly modified the patch to accommodate both (not tested yet).

TODO: Check the migration wizard again.

Changes by 13864ce2

browser/components/preferences/privacy.js and modules/libpref/init/StaticPrefList.yaml conflict.

This is basically a partial revert, so I had these conflicts in the first place in some releases ago. However, it was kinda easy to solve (just code deletion).

123

This rebase should be comparable with tor-browser-115.9.0esr-13.5-1-build1. (In 122, I followed the usual approach to squash commits, then cherry-picked the remaining ones, but I didn't compare 123 and 115.9.0 directly).

My branch for this rebase is tor-browser-123-13.5-1.

Base commit: aa8ba3be74720b19e24461d15a83cf38a7f00b5c.

Rebase log

`browser/installer/package-manifest.in`

Bug 16285: Exclude ClearKey system for now

New clearkey implementation (WMF). Commented also that one (which in any case is built only when tests are enabled).

TODO: Audit it (I think Thorin already had an issue for it).

`services/settings/dumps/main/moz.build`

Bug 31740: Remove some unnecessary RemoteSettings instances

A new entire block of stuff for search engine icons. We really have to do something for the remote settings.

TODO: Check what this breaks.

`browser/components/about/AboutRedirector.cpp`

Bug 42037: Disable about:firefoxview page

firefoxview-next has been removed.

`browser/components/about/components.conf`

Bug 42037: Disable about:firefoxview page

Also removal of firefoxview-next.

`browser/locales/jar.mn`

fixup! Base Browser strings (a3b68aae356e)

preview/select-translations.ftl just before where we add our no-translate file.

`toolkit/components/extensions/ExtensionParent.sys.mjs`

Bug 40069: Add helpers for message passing with extensions

Bug 1869678 (7f3019ccf2557112b7bb67e15173bb148a23f160) moved the CacheStore class that was before the functions we use to pass stuff to NoScript (git show --color-moved shows no changes during the movement, and in any case it seems to me we weren't using that class).

`browser/components/preferences/privacy.js`

Bug 40925: Implemented the Security Level component

New property (shouldUpdateSiteUsageDataForSanitizeDialog) before where we define _initSecurityLevel.

`toolkit/content/widgets/message-bar.css`

Bug 2176: Rebrand Firefox to TorBrowser

Bug 1845150 (614f900ec639d089866c6c8583e40affda911284) modified the notification bar. It removed .container.infobar.

The code is now in a new file (toolkit/content/widgets/infobar.css), so I've reported our change there.

`xpcom/io/CocoaFileUtils.mm`

Bug 13252: Customize profile management on macOS

Seems some refactor that add a lot of nsAutoreleasePool (Bug 1684897, 41a94980743ba7b4e800d57ec7a7bdae3f384645).

`toolkit/modules/moz.build`

Bug 40807: Added QRCode.js to toolkit/modules

PromiseUtils.sys.mjs has been removed upstream.

`browser/base/content/browser-siteIdentity.js`

Bug 23247: Communicating security expectations for .onion

_hasCustomRoot has a much simpler implementation. It changed in Bug 1867624 (4c2785e75c118a6645e6fbf71f915b2b49cf6750). I don't think the version before the conflict was 100% related to our needs, so I'm just accepting upstream.

TODO: Make sure we run something that needs this code and check if this change introduces new errors. Possibly, we should add tests, tests tests!

`toolkit/content/aboutNetError.xhtml`

Bug 30237: Add v3 onion services client authentication prompt

The file has been renamed to aboutNetError.html.

We used to add only a script, so I added it back. But I'd expect the script not to work anymore as expected.

TODO: Check if anything in about:neterror is now broken.

`modules/libpref/Preferences.cpp`

Bug 40458: Implement .tor.onion aliases

Our patch to improve Preferences.cpp was uplifted in this period ️. It was Bug 1873526 (04689ca3bcc74f18b7dfa3a298ad8ccd647f2682).

124

This rebase should be comparable with tor-browser-115.9.0esr-13.5-1-build1.

My branch for this rebase is tor-browser-124-13.5-1.

Base commit: 9dc81f5fd450813cee5908180e903cb18b47b0b5.

Rebase log

`python/mozbuild/mozbuild/artifacts.py`

Bug 28369: Stop shipping pingsender executable

New platform.ini file, just before pinsender.

`browser/components/urlbar/UrlbarUtils.sys.mjs`

Bug 41327: Disable UrlbarProviderInterventions

New UrlbarProviderOpenTabs import.

Also, we commented out a switch. I've commented only the returns, so that it's easier to patch it again.

`mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java`

Bug 30605: Honor privacy.spoof_english in Android

New settings before our spoof English.

`browser/locales/jar.mn`

fixup! Base Browser strings (059fdd5c3803)

New preview file (preview/translations.ftl).

`browser/components/BrowserGlue.sys.mjs`

Bug 31575: Disable Firefox Home (Activity Stream)

New lazy imports that we might want to remove (ASRouter, ASRouterDefaultConfig). It seems they were already in BrowserGlue, but then converted to ESM (see Bug 1878731, 24defeb8da3e3ee45214313531c952824b35c321).

TODO: Check them.

Bug 40458: Implement .tor.onion aliases

New import (OnboardingMessageProvider) where we used to add OnionAliasStore.

`browser/components/BrowserContentHandler.sys.mjs`

Bug 4234: Use the Firefox Update Process for Base Browser

An update in a comment, and Services.prefs is used directly instead of prefb.

As a parameter now is passed updateMilestones, which will influence whether we will update some prefs with the new Base Browser version.

We have some code that mirrors Firefox's behavior, I've updated it as well.

The changes were part of Bug 1749345 (1eb7ddbd5d22c648aee449dc7caaca352656285c).

TODO: verify if my changes make sense and are needed.

`browser/components/preferences/privacy.js`

Bug 40925: Implemented the Security Level component

The property added a few versions ago (shouldUpdateSiteUsageDataForSanitizeDialog) has been removed.

`browser/components/preferences/preferences.xhtml`

Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

New JS before BridgeEmoji.js (chrome://global/content/elements/moz-message-bar.mjs).

Also, a couple of new <richlistitem ...> before our #include for the connection page menu entry.

125

We're going beta

At the time of writing, 125 has just entered the beta stage.

My idea is to try follow the beta channel until we arrive at 128, for several reasons.

First, we decided to release 13.5 in June, that is when 128 enters beta. The alternative would be to wait another month for 128 to reach mozilla/release (or even mozilla/esr128), or to rebase on mozilla/release and start working on top of 127, and then do another big leap.

Working on 128 beta sounds like the best plan to me.

Apart from that, I'd like to see how fast the beta channel goes. I expect many conflicts when a version jumps from nightly to beta, but then I expect the conflicts to be much less. If this is the case, we could probably do the merge manually, and then see if the continuous rebase can keep the rest.

Moreover, I don't expect many backings in beta, and in general a more stable codebase. Beta has tags, which could help to keep a pace with the continuous rebase.

Starting earlier with this approach gives me some time to come up with a draft of continuous rebases.

125 so far had more conflicts than previous rebases. I don't know if this is because of the change of channel, or just because Moz worked a lot on the same areas we change.

Rebase log (125b1)

125b1

Base commit was 390c37aebde8583ee7e34bb627747061e6cc6495.

Bug 40002: Remove about:ion

`browser/components/about/AboutRedirector.cpp`

Upstream added a new profilemanager about page.

Bug 28369: Stop shipping pingsender executable

New nmhproxy executable (Native Messaging Host Proxy). Affected files:

browser/app/macbuild/Contents/MacOS-files.in
browser/installer/package-manifest.in
browser/installer/windows/nsis/shared.nsh
- Why do we even modify it? We don't really use it!
python/mozbuild/mozbuild/artifacts.py
- This also has a refactor in MacArtifactJob.

Bug 30605: Honor privacy.spoof_english in Android

`mobile/android/geckoview/api.txt`

The method after

    method @NonNull public GeckoRuntimeSettings.Builder spoofEnglish(boolean);

has been marked as deprecated.

Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView

`mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java`

New method (getSystemLocalesForAcceptLanguage) after the computeAcceptLanguages we entirely modify.

This patch replaces another function. Previously, it used getDefaultLocales, now it uses the new getSystemLocalesForAcceptLanguage function.

TODO: Verify that the patch is still working as we expect.

Bug 26345: Hide tracking protection UI

The new about:profilemanager hits again (browser/components/about/AboutRedirector.cpp and browser/components/about/components.conf).

BTW, about:settings is now also here.

Bug 41631: Prevent weird initial window dimensions caused by subpixel computations

`toolkit/components/resistfingerprinting/RFPHelper.sys.mjs`

I haven't found the source of the conflict. I've dropped a couple of hunks that only added newlines.

Bug 31575: Disable Firefox Home (Activity Stream)

`browser/components/BrowserGlue.sys.mjs`

New AWToolbarButton import and related task (AWToolbarButton.SetupButton).

`browser/components/about/AboutRedirector.cpp`

New about:settings after our #endif.

Bug 4234: Use the Firefox Update Process for Base Browser.

`browser/app/Makefile.in`

Bug 1854868 (26ab0df7351aa21038299b1a56ad369fea5d0154) mentions updater changes on macOS (in particular, the replacement of update-settings.ini).

For us, it's a mv+ln changed with a cp, no big deal.

`browser/base/moz.build`

A new big chunk of code to allow overriding the update page through experiments.

`browser/installer/package-manifest.in`

I think changes related to the ones in Makefile.in.

`toolkit/mozapps/update/updater/updater.cpp`

Sigh.

Probably more update-settings.ini changes. I hate merging this file.

The conflict is around gArchiveReader.VerifyProductInformation.

Bug 40925: Implemented the Security Level component

`browser/base/content/main-popupset.inc.xhtml`

Translations (that is before the security level popup) split into two files.

`mobile/android/geckoview/api.txt`

Again the deprecated stuff.

Bug 41089: Add tor-browser build scripts + Makefile to tor-browser

`.gitignore`

We append, upstream also did.

Bug 2176: Rebrand Firefox to TorBrowser

`browser/app/Makefile.in`

A few changes before the line we change, but not a big deal.

Bug 40597: Implement TorSettings module

`toolkit/modules/moz.build`

Upstream removed a line (not a big deal).

Bug 41600: Add a tor circuit display panel.

`browser/base/content/browser.js`

New XPCom lazy script getter:

XPCOMUtils.defineLazyScriptGetter(
  this,
  "gProfiles",
  "chrome://browser/content/browser-profiles.js"
);

`browser/base/content/main-popupset.inc.xhtml`

Translations again.

Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop

`toolkit/components/places/PlacesUtils.sys.mjs`

Log has been removed.

Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

`browser/components/preferences/main.inc.xhtml`

Probably something changed in the big chunk of code we remove (Firefox's network settings).

It'd seem connection-proxy-option-wpad.label, from the range-diff.

`browser/components/preferences/preferences.xhtml`

Again the BridgeEmoji.js problem.

Bug 27476: Implement about:torconnect captive portal within Tor Browser

`browser/base/content/browser.js`

gProfiles again.

Bug 41668: Tweaks to the Base Browser updater for Tor Browser

`config/createprecomplete.py`

New exclusions, re-added ours.

This line:

                or rel_path_file.find("distribution/") != -1

has changed to

                or "distribution/" in rel_path_file

Bug 16940: After update, load local change notes.

`browser/components/about/AboutRedirector.cpp`

profilemanager is the conflicting thing again.

Bug 40701: Add security warning when downloading a file

`browser/components/downloads/content/contentAreaDownloadsView.js`

The visibilitychange handler doesn't take the aEvent parameter anymore.

The following rebases didn't have any conflict .

Cherry-pick to reach parity with alpha log

Parity with alpha

ce6c08c3 fixup! Bug 2176: Rebrand Firefox to TorBrowser

`browser/base/content/aboutDialog.xhtml`

The removal of DTD conflicts with the XML stylesheets.

Speaking of which, I think I found I forgot to add our CSS!

f7adb137 Bug 41916: Letterboxing preferences UI

`browser/components/preferences/preferences.xhtml`

XML stylesheets once again.

However, I preferred moving the addition of base-browser.ftl to a fixup of the Base Browser strings commit.

74db46f9 fixup! Bug 40925: Implemented the Security Level component

`browser/components/securitylevel/content/securityLevel.js`

Conflicts because 125 was already modularized.

494af376 fixup! Bug 40925: Implemented the Security Level component

Skipped: it's the security level modularization.

e0cdf1dc fixup! Bug 2176: Rebrand Firefox to TorBrowser

`browser/branding/branding-common.mozbuild`

Single vs. double quotes/linting

Let's build it

I took some time to try to build this rebase (the -1 branch).

Apart from an additional parenthesis I added by mistake, the build errors were mostly upstream becoming stricter about ShouldResistFingerprinting.

The catch-all target RFPTarget::Unknown doesn't exist anymore. It's kinda hard to find an exact match for some of our patches.

Also, I think that all the problematic parts have some room for improvements. I'm going to keep these fixes separate until the proper review.

As for runtime problems, I encountered a problem with some jsm that still remained for Security Level.

At the moment of writing, we still have a few jsm:

browser/actors/AboutTBUpdateChild.jsm
browser/actors/AboutTBUpdateParent.jsm
browser/actors/CryptoSafetyChild.jsm
browser/actors/CryptoSafetyParent.jsm
toolkit/components/lox/lox_wasm.jsm
toolkit/modules/Bech32Decode.jsm

Apart from lox, which is going to require some changes also on the generator, the rest is the crypto safety patch (for which I probably didn't get runtime errors because it wasn't actually triggered) and for the update page, which also wasn't probably triggered.

I'm not sure on how to proceed with these ones, as they aren't necessary to get the browser going, but we'll likely need to fix them.

TODO: Finish ESMification with ESR128.

Then, I noticed that there are a few warning, about the need to move away form XPCOMUtils to ChromeUtils for lazy stuff. It'll be also converted automatically by the linter.

Speaking of which, using Console.sys.mjs is now an error reported by the linter. Instead, we need to switch to console.createInstance (upstream meta).

TODO: Switch everything to console.createInstance.

However, I haven't tried to lint everything. It might make the review more difficult, so I'm a bit undecided also about it.

marked this issue as related to #41328 (closed)

126

A new strategy to find conflicting commits

Finding commits

For 126, I decided to try a new strategy: instead of just trying to rebase on the latest commit, I decided to squash the patchset into a single commit and try to see if I could use it to find the conflicting commits.

I used git checkout in this way:

git checkout -b tmp-branch-1 mozilla/release # Or find something with a command like git merge-base tor-browser-125-13.5-3 mozilla/release
git checkout tor-browser-125-13.5-3 -- .
git commit -m "Squashed patchset"
git checkout -b tmp-branch-2 mozilla/master
git cherry-pick tmp-branch-1

It worked: I could find at once all the conflicts.

With some smart git blame, I could find all the various commits. I wrote a script to do it for me.

Then I did something that maybe was not so useful: I tried to rebase the squashed commit on top of each failing commit (I took the oldest commit after the last good one).

I found a nice list of conflicts, but maybe we just want to know what they are making fail, instead of having a comprehensive list.

Anyway, this was the list:

bf48a8b5938ecc64962809cb9bf20b2947213bef
95ccf713ef1259c6a6c1223a819472bf99daaab8
3e9e678d7eb6bd90d8fcf8942b995b89a74c0a97
363171a8e5421c470c6a8d2606c1c73611ed690e
c8e3989334bf98ee4fef9f0711677e36bce05c97
c816dcfce381aa67971a6cce411be6d410fe7181 (this was the only missed one from the cherry-picking on mozilla/master, and notice that it's the commit just after the previous one, which might be the reason)
00cbde2fa61cd7d6b284491e935abc95741df0e3
d1e65e8eb331012e2a5545a92131906b3a592895
83c0fe30b58021df8884bddcab71728bbc3144e8 (document.datetime uplift)
d5f44743a36a03a858092642417baa2be46990a2

Rebase log

I've used another approach to find the conflict before actually rebasing.

bf48a8b5938ecc64962809cb9bf20b2947213bef

`.eslintignore`

It appends new entries to that file.

95ccf713ef1259c6a6c1223a819472bf99daaab8

`browser/base/content/browser-addons.js`

Removed some arguments from functions we customized in "Bug 41736: Hide NoScript extension's toolbar button by default.".

3e9e678d7eb6bd90d8fcf8942b995b89a74c0a97

`.gitignore`

We both append (we do it in "Bug 41089: Add tor-browser build scripts + Makefile to tor-browser").

363171a8e5421c470c6a8d2606c1c73611ed690e

`toolkit/components/moz.build`

Normandy has been enabled also for Thunderbird?!

`browser/components/preferences/privacy.js`

Imports the parental control service where we import the security level and onion auth stuff.

c8e3989334bf98ee4fef9f0711677e36bce05c97, c816dcfce381aa67971a6cce411be6d410fe7181

I've done them together.

`toolkit/components/resistfingerprinting/RFPHelper.sys.mjs`

New topics, renamed the old actor to LetterboxingActor.

00cbde2fa61cd7d6b284491e935abc95741df0e3

`browser/components/search/SearchSERPTelemetry.sys.mjs`

This file again ️. I hate it. This time it went through a really massive change.

cbb0f9261415feb8609a636b218fbdf636697146

`toolkit/components/moz.build`

Initially missed this commit! It's normandy again.

d1e65e8eb331012e2a5545a92131906b3a592895

`services/settings/dumps/main/moz.build`

Settings dumps have been reorganized, breaking our "Bug 31740: Remove some unnecessary RemoteSettings instances". This patch absolutely needs to be reorganized.

TODO: Reorganize this patch!

`services/settings/static-dumps/main/moz.build`

Conflicts in the query-stripping.json we add in "Bug 41092: Add a RemoteSettings JSON dump for query-stripping". I've just re-added the file to all targets.

TODO: Check if this file is used also from Android. (I would say so, since it's referenced inside toolkit).

`browser/installer/package-manifest.in`

We modify it in "Firefox preference overrides." and in "Bug 40562: Added Tor Browser preferences to 000-tor-browser.js".

The JSON dumps (that are exactly before the change we do there) have been reduced to a single line, hence the conflict.

d5f44743a36a03a858092642417baa2be46990a2

`browser/components/preferences/preferences.xhtml`

Couple of <script> elements added upstream.

Build problems

a48079cd7255bf1a493480a68978faec9d1a3b6d removed the bool type from .idl, in favor of boolean
usual ShouldResistFingerprinting changes (in "Bug 42472: Spoof timezone in XSLT." in this case)
I tried to cross-compile on Windows for upliting purposes. Our Clang was accepted, cbindgen was too old. I installed a Rust toolchain with rustup (I think it's okay for local dev builds) and configure complained about missing windows=0.52. I downloaded it with cargo download (after running cargo install cargo-download).
- accessible/windows/uia/uiaRawElmProvider.cpp:94:21: error: no member named 'UiaClientsAreListening' in the global namespace: it seems our mingw is too old . The function was added 5 months ago.
- we need to update our Windows mozconfigs: https://phabricator.services.mozilla.com/D195662

TODO: It seems new identity broke at a certain point!

Noticed by thorin and reported in #42556:

This seems to be the outer catch, and it also logs the exception.

The next time I build RR (probably soon, to catch up with 127), I should check what's wrong.

This time we weren't lucky with the beta channel, and got a couple of conflicts:

41dc0349588145ad0a49171208cb7b0515fd9a8e
- toolkit/mozapps/update/updater/launchchild_osx.mm: trivial to solve: the function to elevate updates, which we put between ifndef changed signature. Took the file from upstream and re-added our #ifdef/#ifndef
- toolkit/mozapps/update/updater/updater.cpp Not so trivial. Took our file, and re-applied the changes from upstream. Then verified our diff didn't change too much (the conflict is mostly a change between MARStrings and gMARStrings)
6b3bff6baa8dde4ba8e9533f3c3041e07d5bb905, browser/base/content/aboutDialog.xhtml: upstream changed their donation link. Dropped any upstream change.

This seems to be the outer catch, and it also logs the exception.

The next time I build RR (probably soon, to catch up with 127), I should check what's wrong.

console.info: NewIdentity: Opening a new window
console.error: NewIdentity: 
  Unexpected error
  Message: TypeError: args is null
  Stack:
    openWindow@resource:///modules/BrowserWindowTracker.sys.mjs:299:1
OpenBrowserWindow@chrome://browser/content/browser.js:2903:34
openNewWindow/<@chrome://browser/content/newidentity.js:407:38
openNewWindow@chrome://browser/content/newidentity.js:395:14
run@chrome://browser/content/newidentity.js:29:18

The bug is self-explanatory: Clean up OpenBrowserWindow (Opened 13 years ago Closed 10 months ago lol).

This should be enough to fix our case:

diff --git a/browser/modules/BrowserWindowTracker.sys.mjs b/browser/modules/BrowserWindowTracker.sys.mjs
index 3a59603226e28..64441992eb541 100644
--- a/browser/modules/BrowserWindowTracker.sys.mjs
+++ b/browser/modules/BrowserWindowTracker.sys.mjs
@@ -296,7 +296,7 @@ export const BrowserWindowTracker = {
       windowFeatures += ",private";
       if (
         (!args && !lazy.PrivateBrowsingUtils.permanentPrivateBrowsing) ||
-        args.private === "no-home"
+        args?.private === "no-home"
       ) {
         // Force the new window to load about:privatebrowsing instead of the
         // default home page.

added Task label

added Desktop label

/cc @richard

127

Like for 126, also for 127 I tried to identify the conflicts first, and then do partial rebases, to solve one conflicting commit at the time.

The way I find potential conflict is by trying to rebase a squashed patchset on the destination:

git checkout $prevBranch -- .
git commit -m "Squashed patchset"
git rebase mozilla/master
~/Tor/lazy-script/find-conflicting.py FIREFOX_126_0_BUILD1

The script missed a couple of conflicting commits, but it's fine.

Also, when starting to rebase on individual commits, I found some conflicts that were generated by Mozilla backporting some fixes (for the updater and the donation link in the about dialog). I re-accepted our changes, knowing the final rebase would fix them.

Almost all conflicts were easy to solve, but a couple of conflicts were due to big refactors. Reviewing them should be easier than solving them, hopefully ️. I described some strategies I adopted.

127 beta actually hasn't already been tagged, but by now I don't expect additional commits.

I'm planning of not taking 127 up until the release, but to start a branch for 128 already, in case we're ready to use it before 128 goes nightly.

Detailed report

First conflict: 066516c72f4a76557fa036b3c6ba91e105e14748

It's about WebRTC. The conflict is with this line (dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs.c, Part 5):

-            addrs[i].interface.type |= NR_INTERFACE_TYPE_TEREDO;
+            addrs[i].iface.type |= NR_INTERFACE_TYPE_TEREDO;

So, accepted upstream and re-applied the fix to wherever this was in the file.

Second conflict: 7071b41cd9e63867cfe95e80f48d5080da8a3b13

Conflicting mobile/android/geckoview/api.txt (known ones):

Bug 30605: Honor privacy.spoof_english in Android
Bug 40925: Implemented the Security Level component

Third conflict: 2cc00a036dce4053b9d2203fb141945f63ca121f

browser/themes/shared/customizableui/panelUI-shared.css, Bug 40925: Implemented the Security Level component.

A few selectors after one block of our additions changed.

Very understandable in the range-diff.

Fourth conflict: ea3de2f78739b70ff5677c0e5d807f37a9b781e8

toolkit/components/search/SearchService.sys.mjs, Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing.

The conflicting change is

-      region: lazy.Region.home || "default",
+      region: lazy.Region.home || "unknown",

However, it's in a block we remove, so accepted ours.

Fifth conflict: 4a8f03d665eb0e803c554c82b81a4133fb6f331d

This is the updater commit that was already backported to 126.

Accepting our diff should be enough.

Sixth conflict: ce6e44b823ff75640a04cab9f9aaf88521ffd156

taskcluster/kinds/source-test/mozlint.yml, Firefox preference overrides..

The list of files to lint (for prefs) has been moved to tools/lint/lintpref.yml. Anyway, the list is directory-based now, so we don't have to change it anymore.

Seventh conflict: 1d63ed18488dd44cd0fb4a4a9721ee8069d2d14e

Major refactor upstream: Bug 1880909 - Move gBrowserInit to its own file.r=Gijs. The new file is browser/base/content/browser-init.js.

For us, we have conflicts in:

Bug 18905: Hide unwanted items from help menu (trivial addition to an if)
Bug 40925: Implemented the Security Level component
- Kept the XPCOMUtils.defineLazyScriptGetter in the old file
- Added the calls in the new file
Bug 40926: Implemented the New Identity feature: same as security level
Bug 41600: Add a tor circuit display panel.: same again
Bug 27476: Implement about:torconnect captive portal within Tor Browser: similar to the other cases, but more involved.
Bug 30237: Add v3 onion services client authentication prompt: easy like the initial ones.

My script didn't initially find this commit (the script has some troubles with removals).

Surprisingly, diff-of-diffs made it easy enough to review this change: you can manually put the diff of browser-init.js in the middle of the diff of browser.js. At that point there won't be many diffs (except for a linting + an update of a comment from SecuritySettingsButton to SecurityLevelButton).

Eighth conflict: 683b6656d13e8cfdfb8816dcaac2fb9fd517d1cd

toolkit/modules/AppConstants.sys.mjs:

<<<<<<< HEAD
  MOZ_SELECTABLE_PROFILES:
#ifdef MOZ_SELECTABLE_PROFILES
=======
  BASE_BROWSER_UPDATE:
#ifdef BASE_BROWSER_UPDATE
>>>>>>> c5c3171a6c3f8 (Squashed patchset)
    true,
#else
    false,
#endif

We can just keep both.

Ninth conflict: e423b5eef6b239fee0d45b6336247146c97b339a

toolkit/modules/moz.build:

<<<<<<< HEAD
    "LogManager.sys.mjs",
=======
    "Moat.sys.mjs",
>>>>>>> c5c3171a6c3f8 (Squashed patchset)

Ditto.

Tenth conflict: 83c84ac5775c0dbdf87c5cb4049c2be86bc461fb

Accept upstream (removed a check for pdf.js and some comments that don't hold anymore after we uplifted the devicePixelRatio patch).

Eleventh conflict: 75ae7f69d33dd0d265ccb93bee3c71451f97d9d6

Bug 1894979 - Convert UpdateService.sys.mjs to use classes. What could go wrong in a 7000+ js file refactor? ️

Bug 4234: Use the Firefox Update Process for Base Browser.

I've removed // eslint-disable-next-line complexity, we'll see if it's still needed (I'm not linting patches at the moment);
when we check if the update is supported (e.g., when we check the various instruction sets). The problem is mostly indentation, and applying indentation to the old content when doing diff-of-diffs helps;
a few lines below (you can search for this.promptWaitTime):

@@ -2363,9 +2406,7 @@ function Update(update) {
       if (!isNaN(attr.value)) {
         this.promptWaitTime = parseInt(attr.value);
       }
-    } else if (attr.name == "unsupported") {
-      this.unsupported = attr.value == "true";
-    } else {
+    } else if (attr.name != "unsupported") {

another block (just because of indentation):

@@ -2390,7 +2431,7 @@ function Update(update) {
   }
 
   if (!this.previousAppVersion) {
-    this.previousAppVersion = Services.appinfo.version;
+    this.previousAppVersion = getCompatVersion();
   }
 
   if (!this.elevationFailure) {

Bug 41668: Tweaks to the Base Browser updater for Tor Browser

We add a function (_registerBootstrapObserver), but it cannot be merged automatically because ES classes don't have commas after function declarations.

Bug 19121: reinstate the update.xml hash check

These two blocks now are in reversed order:

diff --git a/toolkit/mozapps/update/UpdateService.sys.mjs b/toolkit/mozapps/update/UpdateService.sys.mjs
index 56387d79fc50f..54de47e9a714c 100644
--- a/toolkit/mozapps/update/UpdateService.sys.mjs
+++ b/toolkit/mozapps/update/UpdateService.sys.mjs
@@ -2156,6 +2156,8 @@ function UpdatePatch(patch) {
         }
         break;
       case "finalURL":
+      case "hashFunction":
+      case "hashValue":
       case "state":
       case "type":
       case "URL":
@@ -2175,6 +2177,8 @@ UpdatePatch.prototype = {
   // over writing nsIUpdatePatch attributes.
   _attrNames: [
     "errorCode",
+    "hashFunction",
+    "hashValue",
     "finalURL",
     "selected",
     "size",

Also, the cases have a different indentation.

Bonus conflict: 26bf957cd0a0317364214ed53eba0b932052bccf

It adds a new script to browser/components/preferences/preferences.xhtml, where we normally add our BridgeEmoji.js.

This conflict in a second stage (when I actually rebased on beta 1).

I decided to cherry-pick tor-browser-115.11.0esr-13.5-1-build1..upstream/tor-browser-115.11.0esr-13.5-1 in a new 127-2 branch.

Logs

e90710d0 Bug 41930: Remove the UI to customize accept_languages.

`browser/components/preferences/main.js`

I think the conflicts are because of the translation listeners that follows the block this patch inserts in 115.

`toolkit/components/resistfingerprinting/RFPHelper.sys.mjs`

Similar. Maybe the problem is that javascript.use_us_english_locale has been removed upstream.

e6f7f151 Bug 42562: Normalized the Accepted Languages on Android.

`mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java`

There's a big block of new settings in the code.

Also getDefaultLocales has been renamed to getSystemLocalesForAcceptLanguage upstream.

736fba53 Revert "Bug 41740: Change the RFP value of devicePixelRatio to 2"

Skipped (uplift).

32a6f98c Bug 1830629: Remove unnecessary checks for pdf.js for RFP. r=tjr

Skipped (uplift).

7c7573c4 Bug 42583: Modify moz-support-link for Base Browser.

`toolkit/content/widgets/moz-support-link/moz-support-link.mjs`

attributeChangedCallback doesn't have oldVal, newVal upstream.

73f0f817 fixup! Bug 41116: Normalize system fonts.

Skipped (uplift).

3841a1fd fixup! Bug 41116: Normalize system fonts.

Skipped (uplift).

09bd48db Bug 1787790: Normalize system fonts with RFP on. r=emilio

Skipped (uplift).

83e6ff81 fixup! Bug 42397: Change RFP-spoofed TZ to Atlantic/Reykjavik.

Skipped (uplift).

499e612d Bug 1835987 - Change RFP-spoofed TZ to Atlantic/Reykjavik. r=tjr

Skipped (uplift).

mentioned in issue #42579

An interesting new error, that emerged for sure after my changes to the search telemetry:

TypeError: this._searchProviderInfo is null
    _getProviderInfoForURL resource:///modules/SearchSERPTelemetry.sys.mjs:939
    _checkURLForSerpMatch resource:///modules/SearchSERPTelemetry.sys.mjs:953
    updateTrackingStatus resource:///modules/SearchSERPTelemetry.sys.mjs:475
    onLocationChange resource:///modules/BrowserUsageTelemetry.sys.mjs:350
    callListeners chrome://browser/content/tabbrowser.js:1021
    _callProgressListeners chrome://browser/content/tabbrowser.js:1041
    _callProgressListeners chrome://browser/content/tabbrowser.js:6714
    onLocationChange chrome://browser/content/tabbrowser.js:7190
tabbrowser.js:1026:23
    callListeners chrome://browser/content/tabbrowser.js:1026
    _callProgressListeners chrome://browser/content/tabbrowser.js:1041
    _callProgressListeners chrome://browser/content/tabbrowser.js:6714
    onLocationChange chrome://browser/content/tabbrowser.js:7190

However, we should rework that patch (the one for remote settings) to be smarter, instead of changing stuff everywhere.

128

I've already started working on 128, even though it's still in nightly (the sooner the better?).

The rationale is that we can deal with all the diffs we already have.

First rebase

Rebase 1

Base commit: 55b8c839700564409af5295286a1fd389410e19b.

Got a conflict because of an upstreamed commit (the one for not persisting data in PBM). I just removed ours, since we don't need it anymore.
New identity, toolkit/components/search/SearchEngine.sys.mjs: 66c7c878a94dccaeb8c00521b8dc36e608111900 modified getSubmission to pass only the data it actually needs (the charset). My decision was to drop that part of our patch, I will open a new issue for it. TODO: Reimplement the safest filter for using HTML with DDG when we're in safest.

Second rebase

Rebase 2

Base commit: 3759e3792f8426e1f75e40c1d6566569b22a7dc1

Base Browser's .mozconfigs.

mobile/android/moz.configure: MOZ_ANDROID_HISTORY -> MOZ_GECKOVIEW_HISTORY (0166b77500ee8c4025c3bc305991e773e054560c)

Bug 4234: Use the Firefox Update Process for Base Browser.

toolkit/mozapps/update/UpdateServiceStub.sys.mjs: Bug 1875502 or 1887980. There was some refactor to make UpdateServiceStub a proper ES class.

Our change was quite simple, but indentation and context changes prevent it from being automatically merged.

Bug 40925: Implemented the Security Level component

browser/base/content/main-popupset.inc.xhtml: Bug 1897503: browser-allTabsMenu.inc.xhtml was moved to browser/components/tabbrowser/ (8f67977eb39e7e78da325cdf82bc1976800c7f00).

Bug 41736: Customize toolbar for base-browser

browser/components/customizableui/CustomizableUI.sys.mjs: there's a new sidebar under development, or something like that (new pref sidebar.revamp to optionally show sidebar-button).

Bug 41600: Add a tor circuit display panel.

browser/base/content/main-popupset.inc.xhtml: same as security level

Bug 30237: Add v3 onion services client authentication prompt

browser/base/content/main-popupset.inc.xhtml: ditto

Bug 42110: Add TorUIUtils module for common tor component methods.

browser/modules/moz.build: upstream removed some files from this moz.build (Bug 1837575 - Move Tabbed Browser related files to browser/components/tabbrowser/, 2f419065dab7ede1db9a7a53e76125ab86c8bfe4).

Third rebase

Rebase 3

Base: fc76676f61ee37b4c5420649cad6677164a29405

Bug 41116: Normalize system fonts

Uplifted ️. So, dropped our commits.

Bug 41966: Allow removing locales from the locale alternatives list.

We got an uplift from Henry! 4d9b10e814e31cbcd67e0e9afd975fa1d7759698 Skipping our commit.

Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs.

Yet another refactor upstream! Bug 1898705 (9d9cd46085f07dd90c4c98ac305d5cc6fbac0522) moves a lot of stuff from browser.css to browser-shared.css.

Bug 32308: Use direct browser sizing for letterboxing.

More conflicts related to the above refactor.

Also, this seems to cause a lot of false-positive in range-diff.

Bug 16940: After update, load local change notes.

Upstream addition where we add our about:tbupdate:

if (Services.prefs.getBoolPref("browser.profiles.enabled")) {
  gInitialPages.push("about:profilemanager");
}

Fourth rebase

Rebase 4

Base: d9496bfef09039b2642da45585ca821c36917c6d

Bug 42397: Change RFP-spoofed TZ to Atlantic/Reykjavik.

Uplifted ️. Dropping our commit.

Bug 30237: Add v3 onion services client authentication prompt

There's a new RequestPointerLock function where we add ours.

Fifth rebase

Base: 1d1ca77dd7ca10953c6f5f1b77b98e4eb528274e.

No conflicts to report.

Sixth rebase

Base: b476ffaef761ff85c012e2d93050cf444ff7be34

Bug 41600: Add a tor circuit display panel

browser/base/content/navigator-toolbox.inc.xhtml: upstream removed the id="urlbar-search-button" from the <box> adjacent to our addition (47de7bd820eb82bb45d1757fd0f4332c9f50d103).

Seventh rebase

Rebase 7

Base: 4210c9289463ec1157f4426dc87f879fc7995f9c

Bug 28369: Stop shipping pingsender executable

platform.ini has been removed from python/mozbuild/mozbuild/artifacts.py (a70f59c7d9da728a355a38dd4dbbd33d5730d442).

Bug 42376: Pass the locale list when constructing l10n in datetimebox

Uplifted ️ (hopefully for good).

Bug 32308: Use direct browser sizing for letterboxing.

360396dcbe23ab84727d42a743c9dbe18899f520 added a comment in a part of code we delete.

Bug 27476: Implement about:torconnect captive portal within Tor Browser

Some new pages can close themselves (524e4f032a4116b418bd43cbd013dd433f9686c7).

In particular, HadOriginalOpener() was replaced with GetTopLevelCreatedByWebContent() in dom/base/nsGlobalWindowOuter.cpp.

Eight rebase

Rebase 8

Base: 46d0387f0b582f00a5722c20d4e6b8693793631b

Bug 40002: Remove about:ion

browser/components/moz.build: 8e7d70c85683b90415ef3633fdc0c59c93736697 adds genai just before ion.

Bug 41635: Disable the Normandy component

toolkit/components/moz.build: 274db790c04c636dd2656d4e0b2b6b87b5ae6230 moves FeatureGate (yet another experimentation API) to the same block as normandy.

Bug 42037: Disable about:firefoxview page

browser/components/moz.build: same as above.

Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs.

browser/themes/shared/browser-shared.css: 76d0705d47c9bac05ad713113e50301919b428f1 moves more stuff from browser.css to browser-shared.css. I moved the betterboxing stuff a little bit higher, since there are some new comments for defining sections.

Bug 32308: Use direct browser sizing for letterboxing.

browser/themes/shared/browser-shared.css: conflicts for the change I just made.

Bug 23247: Communicating security expectations for .onion

security/certverifier/CertVerifier.cpp: Bug 1900132 (5f40615f5d02b274e3cdc19abdca61cf5f8a0d77 + 6d1611afa26fe5e9230ee7bf1446a8473d9d66ff)

  if (isBuiltChainRootBuiltInRoot) {
    *isBuiltChainRootBuiltInRoot = isBuiltChainRootBuiltInRootLocal;
  }

now contains additional checks on rv and has been moved before

  if (rv != Success) {
    return rv;
  }

I think it's fine for us.

Mullvad Browser

I haven't rebased Mullvad Browser when rebasing Tor Browser...

And as a result I have a lot of conflicts on the first rebase. I had already found some of them in earlier Firefox versions when rebasing Tor Browser.

Mullvad Browser rebase 1

This is the first rebase of Mullvad Browser.

The base from Moz was 3759e3792f8426e1f75e40c1d6566569b22a7dc1, but I started from the second rebase of Tor Browser and cherry-picked base-browser-115.11.0esr-13.5-1-build1..mullvad-browser-115.11.0esr-13.5-1-build1.

MB 38: Mullvad Browser configuration

browser/installer/package-manifest.in: see earlier notes about d1e65e8eb331012e2a5545a92131906b3a592895 for Tor Browser.

taskcluster/kinds/source-test/mozlint.yml: see conflicts for ce6e44b823ff75640a04cab9f9aaf88521ffd156.

MB 1: Mullvad Browser branding

browser/app/Makefile.in: I think it's the same problems as above, caused by 26ab0df7351aa21038299b1a56ad369fea5d0154.

browser/branding/branding-common.mozbuild: changes of single quotes with double quotes (from Firefox 125).

MB 20: Allow packaged-addons in PBM.

toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs: ExtensionPermissions is an ES module, not a JSM anymore.

MB 63: Customize some about pages for Mullvad Browser

docshell/base/nsAboutRedirector.cpp: new about:webauthn page (Bug 1854618, 4240388b197aa1e8839e7c91c51a5b897925fc04).

MB 37: Customization for the about dialog

browser/base/content/aboutDialog.xhtml: I think it was because of the donation URL changes (see Tor Browser).

MB 39: Add home page about:mullvad-browser

browser/base/content/browser-places.js: newTabURLs now includes "chrome://browser/content/blanktab.html".

browser/components/BrowserGlue.sys.mjs: upstream removed AboutPlugins.

browser/components/about/AboutRedirector.cpp: new profilemanager page.

TODO: Should we move our page to HTML? (Also about:tor in case).

TODO: Should we delete the asrouter admin page? (about:asrouter, disabled by default).

MB 21: Disable the password manager

browser/base/content/appmenu-viewcache.inc.xhtml: the passwords button doesn't have a command attribute anymore (it's handled in browser/components/customizableui/content/panelUI.js, see Bug 1890718, 33a958aba0a1df2300a553f3e3ed40b572657beb). Still, I decided to add hidden="true".

browser/components/BrowserGlue.sys.mjs: there's a new Megalist actor, maybe some changes in the blob of code we entirely remove.

browser/components/moz.build: new about:aboutwelcome and about:asrouter entries.

browser/components/preferences/privacy.inc.xhtml: the <label> after the <groupbox> we hide has changed a little bit, but we hide it, so I kept upstream's changes (still, this was enough to trigger the conflict).

toolkit/components/passwordmgr/LoginHelper.sys.mjs: we completely remove the body of the openPasswordManager function. Its content has changed between 115 and 128, but we don't care, because we just delete it.

MB 112: Updater customization for Mullvad Browser

toolkit/mozapps/extensions/AddonManager.sys.mjs: new pref constant (PREF_USE_REMOTE).

MB 213: Customize the search engines list

toolkit/components/search/SearchService.sys.mjs: there's a new way to initialize #engineSelector. Also, to be on the safe side, I decided to remove its initialization also from reset(), even though it's a test-only function (according to its documentation).

Maybe some conflicts also in the blocks of code we remove, but we remove them, so we likely don't care of them. Also, I removed some new code for using localized versions of the search engine. We don't localize anything, so I preferred removing that code, but maybe we don't have to, and we can keep it. Maybe we should gate this on spoof English, instead.

TODO: We must find a cleaner way to clean this telemetry/remote settings. IIRC, in Tor Browser we don't have this change (but if we find a better way to do it, we won't need to add it, either).

TODO: Audit the new code for the engine localization.

MB 80: Enable Mullvad Browser as a default browser

browser/components/shell/ShellService.sys.mjs: Mozilla actually removed the isDefaultBrowserOptOut method ️. Plus, exeArgs has been renamed to extraFileExtensions.

browser/components/shell/nsWindowsShellService.cpp: there's a new piece for checking AUMIDs that take MSIX into account (GetMsixProgId). So, there was some

browser/installer/package-manifest.in: upstream removed the localization files because they reworked this a lot (bug 1826375).

toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp: okay, the big upstream refactor continues. I just changed the various AUMID prefixes I could find in that file, and I didn't reimplement the simplified wmain function, as I think Mozilla themselves simplified it in the new toolkit/mozapps/defaultagent/proxy/main.cpp.

toolkit/mozapps/defaultagent/moz.build: dropped our changes, as we need to build first, and see what breaks. If we can just simplify the patch it's a good thing ️.

TODO: See how the refactor influences us.

I went through the range-diff and added a commentary.

It's an HTML file you should download and open locally (I promise no tricks ) because it has the colors you'd get from the range-diff locally.

I would like to do something similar also for Base Browser and Tor Browser.

The nice thing about HTML is that it allows to add the collapsible sections.

The not-so-nice thing is that adding inline comments/tooltips is harder. An alternative is to use PDFs with annotations instead, and maybe have page breaks for each commit.

Another advantage of HTML is that it's easy to extract text from it and copy/paste it to following versions of the commentary, whereas with PDFs is harder.

Please let me know if you have preferences.

Finally, the commit hashes are inevitably going to change. Hopefully, this won't be a big deal.

Branch guide

Every branch should be easy enough to range-diff with the previous line.

The only exception are -2 branches, that are like -1 branches, but with squashed commits.

It should be feasible to check that diff-of-diffs between commit groups is okay (I think my diff-of-diffs.py --range-diff should handle this case).

Branch name	Commentary	Base	Compare with	Corresponding ESR	Additional notes
`tor-browser-116-13.5`	116.html	`ff486626d0de0e7f34d65ef000c657080ddf564d`	`tor-browser-115.8.0esr-13.5-1-build1` (yep, the tag!)	115.1.0	I had some additional conflicts for patches uplifted between 115.2.0 and 115.8.0.
`tor-browser-117-13.5`	116-117.html	`1b3efa594736dc2cace8f92611707e876a66fba6`	`tor-browser-115.8.0esr-13.5-1-build1`	115.2.0
`tor-browser-118-13.5`	117-118.html	`281ea239d30c6fa22254b074cb9a06d909802cb1`	`tor-browser-115.8.0esr-13.5-1-build1`	115.3.0	No changes to comment!
`tor-browser-119-13.5`	118-119.html	`32855b82e4f84848c92a9ce46a4f62c58bbd3b10`	`tor-browser-115.8.0esr-13.5-1-build1`	115.4.0	I lost `lazy.AboutNewTab.init();`, restored it in 127 and also another small change in the same file, fixed in 128.
`tor-browser-120-13.5`	119-120.html	`2286d3197e38e12030730095c3963015f2f940d5`	`tor-browser-115.8.0esr-13.5-1-build1`	115.5.0
`tor-browser-121-13.5`	120-121.html	`2b0d4f47383233a8b48f2b2d5aa4a0f24770baa3`	`tor-browser-115.8.0esr-13.5-1-build1`	115.6.0
`tor-browser-122-13.5-1`	121-122.html	`3d7f487b56c7d78c380072eacb51a7d0ad736e39`	`tor-browser-115.8.0esr-13.5-1-build1`	115.7.0
`tor-browser-122-13.5-2`	122-cherry-pick.html	`3d7f487b56c7d78c380072eacb51a7d0ad736e39`	`tor-browser-115.8.0esr-13.5-1`	115.7.0	I squashed the commits according to the usual rules and added at the end of the branch the commits released between `-build1` and the next rebase.
`tor-browser-122-13.5-3`		`3d7f487b56c7d78c380072eacb51a7d0ad736e39`	`tor-browser-115.9.0esr-13.5-1-build1`	115.7.0	Almost the same as `-2`, but with squashed commits (removed a few uplifted commits and removed a reverted commit).
`tor-browser-123-13.5-1`	122-123.html	`aa8ba3be74720b19e24461d15a83cf38a7f00b5c`	`tor-browser-115.9.0esr-13.5-1-build1`	115.8.0	There was also 115.9.1 for a chemspill! But we cherry-picked the fixes.
`tor-browser-124-13.5-1`	123-124.html	`9dc81f5fd450813cee5908180e903cb18b47b0b5`	`tor-browser-115.9.0esr-13.5-1-build1`	115.9.0	I think I used .9 to allow an easier range-diff
`tor-browser-125-13.5-1`	124-125.html	`7326355a1d34afe4199e3a549fcc7e0550f15519`	`tor-browser-115.9.0esr-13.5-1-build1`	115.10.0	This is the first branch I built, so it has a few additional commits to fix stuff for building purposes.
`tor-browser-125-13.5-2`	125-cherry-pick.html	`7326355a1d34afe4199e3a549fcc7e0550f15519`	`tor-browser-115.10.0esr-13.5-1-build1`	115.10.0	Same as `-1` + cherry-picked `tor-browser-115.9.0esr-13.5-1-build1..tor-browser-115.9.0esr-13.5-1`
`tor-browser-125-13.5-3`	125-2-3.html	`7326355a1d34afe4199e3a549fcc7e0550f15519`	`tor-browser-115.10.0esr-13.5-1-build1`	115.10.0	Same as `-2`, but commits have been squashed around. Some range-diff noise because of that (esp. in betterboxing)
`tor-browser-126-13.5-1`	125-126.html	`FIREFOX_126_0_BUILD1`	`tor-browser-115.10.0esr-13.5-1-build1`	115.11.0
`tor-browser-126-13.5-2`		`FIREFOX_126_0_BUILD1`	(not easy comparison)	115.11.0	Same as `-1`, but squashed. Additional commits not cherry picked yet.
`tor-browser-126-13.5-3`		`FIREFOX_126_0_BUILD1`	`tor-browser-115.11.0esr-13.5-1-build1`	115.11.0	Same as `-2` + `tor-browser-115.10.0esr-13.5-1-build1..tor-browser-115.10.0esr-13.5-1`.
`tor-browser-127-13.5-1`	126-127.html	`FIREFOX_127_0b1_RELEASE`	`tor-browser-115.11.0esr-13.5-1-build1`	115.12.0	Based on 127 beta, not released as stable yet!
`tor-browser-127-13.5-2`	127-cherry-pick.html	`FIREFOX_127_0b1_RELEASE`	`tor-browser-115.12.0esr-13.5-1-build1`	115.12.0	Ran autosquash on `-1`, and cherry-picked `tor-browser-115.11.0esr-13.5-1-build1..upstream/tor-browser-115.11.0esr-13.5-1` to make the 128 review easier.

I have three branches for 128, but they don't have a "fixed" base (I'm still rebasing them as Mozilla keeps developing 128).

When we fix a base, I will create branches for the MR. At the moment, my branches are {base,tor,mullvad}-browser-esr128-14.0, and my intention is to keep rebasing them on gecko-dev/esr128 after this branch becomes available. For now I'm following gecko-dev/master and I'll switch it to gecko-dev/beta when 128 hits beta.

First commentary for 127-128

Base Browser 115-128 v1

tor-browser-117-13.5 116-117.html

147: 2d6a532bcae0d ! 147: ed47c55c4e993 Bug 7494: Create local home page for TBB.

Nit: for browser/base/content/browser-places.js, the two "uri?." could be replaced with just "uri." since mozilla already checks that the uri is not falsey.

@pierov these diff comments are really useful. Thanks for putting it together!

Going with HTML (so, a plain-text-based format) also gives the opportunity to review the commentaries themselves.

My lazy-script repo contains the script I use to split the various commits.

Therefore, I think you folks could re-run the range-diff (I'm trying to always write the ranges I used at the top of the HTML file) and then compare the HTML you get with the one to which I added comments.

The diff should be only the comments themselves (but I might have lost some newlines when I split some commits in several <pre> elements).

TODOs

WIP

Finish esmification on our side (#41328 (closed))
Lint everything
Switch from XPCOMUtils to ChromeUtils
Check the various !keepforreview commits
Rework all the new search telemetry (and possibly the entire "Remove some unnecessary RemoteSettings instances" commit; maybe it's time we use the approach suggested by cypherpunks1 in #40569)
toolkit/content/widgets/message-bar.css: we customize our gradient. Upstream moved this customization to @media not (prefers-contrast) (I guess for a11y). We should check everything is still okay for us (but I guess UX will agree with the choice)
Check if we have a regression with form on http .onion (#42608 (closed))
Check !765 (closed) is in a good shape in 128 (browser.urlbar.onionRewrites.enabled in sOverrideRestrictionsList in modules/libpref/Preferences.cpp)
Check that the SSO selectors are still valid (upstream removed the CSS rule for hiding them in Windows 7 and 8, so I had to restore the whole rules)
Check how the changes in OpenBrowserWindow affect New Identity (already fixed, not sure there are more)
Verify the pref clipboard.imageAsFile.enabled (introduced in 120) is still a thing in 128 and set it in our profiles, or restore the previous patch for "Bug 33955: When copying an image only copy the image contents to the clipboard" (#42611 (closed))
Do we still care of the LaterRun (#41568 (closed)) patch, after the threat model changes? Do we have an issue for reviewing disk leaks protections not related to content?
Check if any upstream changes to the updater broke the post update in Mullvad Browser (I don't believe so, and maybe just running an update in nightly could be enough)
Check if upstream would be interested in a patch to define BLOCK_LOADLIBRARY_INJECTION with a configure-time flag (see Bug 1869397)
Check the breakage introduced by the removal of javascript.use_us_english_locale (thorin already opened an issue for this)
Audit _initThirdPartyCertsToggle in browser/components/preferences/privacy.js (da6045d85c1829f6ce0dc642f6a7d7a6d5a2db0b, Bug 1848815)
Audit the new clearkey system (probably we'll end up disabling anyway) (thorin might already have an issue for it)
_hasCustomRoot (browser/base/content/browser-siteIdentity.js) has been refactored. We should make sure to test it with some onion services+HTTPS (maybe we should loop rhatto in if he's still doing onion service testing) - opened #42613 (closed)
about:neterror is now an HTML file (not XHTML). The commits is a94d5c59e66c4bff52945dba4c87f4f5f73ac867. We should make sure our changes still work (if still any, I haven't followed 13.5 developments there). From a first glance, ids weren't changed, but some <p> has been trasnformed to <div>.
Two of the about: pages we remove have new components associated ("aboutwelcome", "asrouter"). Shall we remove them?
Verify if query-stripping works also on Android. If it doesn't, its associated configuration can be moved to be desktop-only (see the change to Bug 41092 in 126).
Restore the patch to detect DDG searches when using safest and send them through the simplified HTML page (#42617 (closed))
Check FeatureGates (#42623 (closed)).
Check the new AI thing (8e7d70c85683b90415ef3633fdc0c59c93736697)
Audit "Bug 1854747 - Stop exposing the image data as file to clipboard" (3b1a417bd3d614c198de708eb5237ef441faac58, Firefox 120)

toolkit/content/widgets/message-bar.css: we customize our gradient. Upstream moved this customization to @media not (prefers-contrast) (I guess for a11y). We should check everything is still okay for us (but I guess UX will agree with the choice)

I think it is correct to not add a gradient when using a contrast theme. This is what it looks like in high contrast: