Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: cherry-pick 1665a1d16d46 from chromium #33682

merged 6 commits into from May 3, 2022


Copy link

@ppontes ppontes commented Apr 8, 2022

Reland "Make web cursor size limits match on browser and renderer"

This reverts commit 38a8343085e53889eba48fcff78a6c2295927333.

Reason for revert: Fix without regressing
(Increased WebCursor limit 128->150px to support DevToolsEyeDropper)

Original change's description:

Revert "Make web cursor size limits match on browser and renderer"

This reverts commit 868b44dd8b4a1a3b9698f561ca17f75e4ec78dd2.

Reason for revert:

Original change's description:

Make web cursor size limits match on browser and renderer

Use NSCursor arrowCursor on Mac for ui::mojom::CursorType::kNull.
(i.e. when WebCursor is constructed with an overly large custom cursor)

Bug: 1246188
Test: Automated unit tests and WPTs
Change-Id: I89627fa13cba96b755b8f80adbc91cfc865b6b1b
Reviewed-by: Henrique Ferreiro
Reviewed-by: Charlie Harrison
Commit-Queue: Mike Wasserman
Auto-Submit: Mike Wasserman
Cr-Commit-Position: refs/heads/main@{#964378}

Bug: 1246188
Change-Id: Id7b3b88e65c012993537ce96c2b5064b7b76646e
Bot-Commit: Rubber Stamper
Commit-Queue: Mike Wasserman
Cr-Commit-Position: refs/heads/main@{#965475}

Fixed: 1246188
Bug: 1292426
Change-Id: I5a490603c3e21e17f3136a3d792a18429eb3f633
Auto-Submit: Mike Wasserman
Reviewed-by: Charlie Harrison
Commit-Queue: Mike Wasserman
Reviewed-by: Henrique Ferreiro
Cr-Commit-Position: refs/heads/main@{#965857}

Notes: Backported fix for CVE-2022-1138.

@ppontes ppontes requested review from a team as code owners Apr 8, 2022
@ppontes ppontes added 15-x-y backport-check-skip semver/patch labels Apr 8, 2022
@electron-cation electron-cation bot added new-pr 🌱 and removed new-pr 🌱 labels Apr 8, 2022
zcbenz approved these changes Apr 14, 2022
@zcbenz zcbenz merged commit a686f7e into 15-x-y May 3, 2022
16 checks passed
@zcbenz zcbenz deleted the cherry-pick/15-x-y/chromium/1665a1d16d46 branch May 3, 2022
Copy link

release-clerk bot commented May 3, 2022

Release Notes Persisted

Backported fix for CVE-2022-1138.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
15-x-y backport-check-skip security 🔒 semver/patch
None yet

Successfully merging this pull request may close these issues.

None yet

4 participants