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 d8d64b7cd244 from chromium #26893

Merged
merged 3 commits into from Dec 10, 2020

Conversation

@nornagon
Copy link
Member

@nornagon nornagon commented Dec 8, 2020

Ensure change type for OverflowControlsClip is returned

This at least ensures that we will update the paint properites for the
composited overflow control layers in pre-CompositeAfterPaint to avoid
stale properties on the layers.

The test doesn't actually reproduce the bug because any test simpler
than the bug case couldn't reproduce the bug as the update would be
triggered in other code paths (any style change, layout change, etc.).

Anyway this CL does fix the bug case.

TBR=wangxianzhu@chromium.org

(cherry picked from commit c20bb9897ef6d26a46391a4dc1658c5d33e0c100)

(cherry picked from commit cfb81e677a508871f56d8bec958d0b585298ae0c)

Bug: 1137603
Change-Id: I5cca970bcf8cda6085527f79a97f269c4e3e9986
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500264
Reviewed-by: Stefan Zager szager@chromium.org
Commit-Queue: Xianzhu Wang wangxianzhu@chromium.org
Cr-Original-Original-Commit-Position: refs/heads/master@{#820986}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536910
Reviewed-by: Xianzhu Wang wangxianzhu@chromium.org
Cr-Original-Commit-Position: refs/branch-heads/4240@{#1446}
Cr-Original-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2540592
Reviewed-by: Victor-Gabriel Savu vsavu@google.com
Commit-Queue: Jana Grill janagrill@chromium.org
Cr-Commit-Position: refs/branch-heads/4240_112@{#26}
Cr-Branched-From: 427c00d3874b6abcf4c4c2719768835fc3ef26d6-refs/branch-heads/4240@{#1291}
Cr-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218}

Notes: Security: backported fix for 1137603.

miniak
miniak approved these changes Dec 10, 2020
@codebytere codebytere merged commit 559c008 into 9-x-y Dec 10, 2020
17 checks passed
Loading
@release-clerk
Copy link

@release-clerk release-clerk bot commented Dec 10, 2020

Release Notes Persisted

Security: backported fix for 1137603.

Loading

@codebytere codebytere deleted the cherry-pick/9-x-y/chromium/d8d64b7cd244 branch Dec 10, 2020
belenko pushed a commit that referenced this issue Dec 14, 2020
* chore: cherry-pick d8d64b7cd244 from chromium

* update patches

Co-authored-by: Electron Bot <electron@github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants