Take the uplifted version of Bug 41740

Merge Info

Related Issues

• #41740 (closed)
• mullvad-browser#xxxxx
• tor-browser-build#xxxxx

Backporting

Timeline

• Immediate: patchset needed as soon as possible
• 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
• No Backport (preferred): patchset for the next major stable

(Optional) Justification

• Emergency security update: patchset fixes CVEs, 0-days, etc
• 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

Merging

• Merge to tor-browser - !fixups to tor-browser-specific commits, new features, security backports
• Merge to base-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
  • NOTE: if your changeset includes patches to both base-browser and tor-browser please clearly label in the change description which commits should be cherry-picked to base-browser after merging

Issue Tracking

• Link resolved issues with appropriate Release Prep issue for changelog generation

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
  • extensions : ma1
  • firefox internals (XUL/JS/XPCOM) : ma1
  • fonts : pierov
  • frontend (implementation) : henry
  • frontend (review) : donuts, richard
  • localization : henry, pierov
  • macos : clairehurst, dan
  • nightly builds : boklm
  • rebases/release-prep : dan, ma1, pierov, richard
  • security : ma1
  • signing : boklm, richard
  • updater : pierov
  • misc/other : pierov, richard

Change Description

Upstream accepted our 2.0 as device pixel ratio patch and removed a (useless) check on pdf.js, because it's already exempted from RFP.

This MR takes the upstream commit.

How Tested

Tested build succeeds (RFPTarget is different upstream)

assigned to @pierov

marked this merge request as ready

While I was about to write that I don't know how to check if pdf.js is exempt from RFP, I had the idea to check with a debugger.

It seems to me it isn't exempted, and we return 2.0. I called DumpJSStack() in the branch where we return it, and I got:

0 render(viewport = "[object Object]") ["resource://pdf.js/web/viewer.js":11660:18]
    this = [object Object]
1 #renderTextLayer() ["resource://pdf.js/web/viewer.js":10364:22]
    this = [object Object]
2 __webpack_modules__</draw/resultPromise<() ["resource://pdf.js/web/viewer.js":10806:27]
3 InterpretGeneratorResume(gen = "[object Object]", val = "undefined", kind = ""next"") ["self-hosted":1455:33]
4 AsyncFunctionNext(val = "undefined") ["self-hosted":852:26]
    this = [object Object]

I think 2.0 could be enough, and it'll remind us that we don't have to carry that patch anymore.

But I can restore the check on pdf.js if preferred.

requested review from @richard

approved this merge request

merged

• cherry-picked to base-browser as be35122b and 3bed85e2
• cherry-picked to mullvad-browser as mullvad-browser@532087af and mullvad-browser@bed64b83