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 4deb522c22 and d88e959e01 from chromium #33852

merged 11 commits into from Apr 29, 2022


Copy link

@ppontes ppontes commented Apr 20, 2022

[skia_renderer] - Don't explicitly clip scissor for large transforms

This adds a check to CanExplicitlyScissor that confirms that the device
space scissor rect, transformed to the quad's local space, can be
transformed back to device space and equal the same pixel bounds.

Without this check, sufficiently large scales and translates could
cause the local-space coordinates of the scissor rect to be in a float
range that does not have single-pixel precision, meaning it could round
significantly. Clipping the quad's coordinates to those rounded edges
and then transforming to device space can result in coordinates that
fall outside the original device-space scissor rect.

If however, we ensure we can round-trip the scissor coordinates, then
any clipping to the quad's coordinates will also be projected to within
the scissor rect as well.

(cherry picked from commit ab1b76f3e7cdad702c562f0b43bf3367caff4812)

Bug: 1272250
Change-Id: I7c37c54efd082723797ccf32b5d19ef285c520c1
Commit-Queue: Michael Ludwig <>
Reviewed-by: Brian Salomon <>
Reviewed-by: Kyle Charbonneau <>
Cr-Original-Commit-Position: refs/heads/main@{#946552}
Auto-Submit: Michael Ludwig <>
Bot-Commit: Rubber Stamper <>
Cr-Commit-Position: refs/branch-heads/4692@{#786}
Cr-Branched-From: 038cd96142d384c0d2238973f1cb277725a62eba-refs/heads/main@{#938553}


[skia_renderer]: Use RectF::Intersect in ApplyScissor

(cherry picked from commit 540e2ecde447b0757dd5bb079a59d8faef3183c1)

Bug: 1299287, 1307317
Change-Id: I026090466ebfb3dee0e9daf0609f04babcf42092
Reviewed-by: Kyle Charbonneau <>
Reviewed-by: Brian Sheedy <>
Commit-Queue: Michael Ludwig <>
Cr-Original-Commit-Position: refs/heads/main@{#982400}
Cr-Commit-Position: refs/branch-heads/4896@{#1017}
Cr-Branched-From: 1f63ff4bc27570761b35ffbc7f938f6586f7bee8-refs/heads/main@{#972766}

Release Notes

Notes: Security: backported fix for CVE-2022-0116 and CVE-2022-1306.

@ppontes ppontes added security 🔒 semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking 15-x-y labels Apr 20, 2022
@ppontes ppontes requested review from a team as code owners April 20, 2022 14:24
@jkleinsc jkleinsc merged commit cac38cb into 15-x-y Apr 29, 2022
@jkleinsc jkleinsc deleted the cherry-pick/15-x-y/chromium/d88e959e01 branch April 29, 2022 00:27
Copy link

release-clerk bot commented Apr 29, 2022

Release Notes Persisted

Security: backported fix for CVE-2022-0116 and CVE-2022-1306.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
15-x-y backport-check-skip Skip trop's backport validity checking security 🔒 semver/patch backwards-compatible bug fixes
None yet

Successfully merging this pull request may close these issues.

None yet

3 participants