-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reland "[CompositeAfterPaint] Remove internals.elementLayerTreeAsText()"
This reverts commit 93235d0. Reason for revert: The failing test just needs a rebaseline (done in this CL). We don't have CQ coverage for mac10.10 so the original CL passed CQ. Original change's description: > Revert "[CompositeAfterPaint] Remove internals.elementLayerTreeAsText()" > > This reverts commit bd07dee. > > Reason for revert: Fails color-layer test on Mac10.10: > https://ci.chromium.org/p/chromium/builders/ci/Mac10.10%20Tests/48789 > > Original change's description: > > [CompositeAfterPaint] Remove internals.elementLayerTreeAsText() > > > > The layer tree mode is not supported in CompositedAfterPaint. > > Remove it and rewrite the tests so that the tests will pass in > > CompositeAfterPaint. > > > > Change-Id: Ided24dc50b6804397777fec8fbce45d8d6cb3174 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1918295 > > Reviewed-by: Philip Rogers <pdr@chromium.org> > > Reviewed-by: Ken Buchanan <kenrb@chromium.org> > > Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org> > > Cr-Commit-Position: refs/heads/master@{#716300} > > TBR=kenrb@chromium.org,wangxianzhu@chromium.org,pdr@chromium.org > > Change-Id: I5a8667762698a7879975510df28578558c29295e > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1923208 > Reviewed-by: Alexey Baskakov <loyso@chromium.org> > Commit-Queue: Alexey Baskakov <loyso@chromium.org> > Cr-Commit-Position: refs/heads/master@{#716389} TBR=kenrb@chromium.org,wangxianzhu@chromium.org,pdr@chromium.org,loyso@chromium.org Change-Id: I1d26efe39fb7dd21ce0509a43cdd62981c68ad1d No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1923329 Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org> Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org> Cr-Commit-Position: refs/heads/master@{#716437}
- Loading branch information
1 parent
b9ac269
commit 5ad3928
Showing
59 changed files
with
427 additions
and
890 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
309 changes: 172 additions & 137 deletions
309
third_party/blink/renderer/core/paint/paint_layer_scrollable_area_test.cc
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 28 additions & 1 deletion
29
third_party/blink/web_tests/compositing/contents-opaque/control-layer-expected.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,28 @@ | ||
| PASS | ||
| { | ||
| "layers": [ | ||
| { | ||
| "name": "Scrolling Contents Layer", | ||
| "bounds": [800, 600], | ||
| "contentsOpaque": true, | ||
| "backgroundColor": "#FFFFFF" | ||
| }, | ||
| { | ||
| "name": "LayoutButton INPUT id='control' class='composited'", | ||
| "bounds": [127, 22], | ||
| "backgroundColor": "#DDDDDD", | ||
| "transform": 1 | ||
| } | ||
| ], | ||
| "transforms": [ | ||
| { | ||
| "id": 1, | ||
| "transform": [ | ||
| [1, 0, 0, 0], | ||
| [0, 1, 0, 0], | ||
| [0, 0, 1, 0], | ||
| [8, 8, 0, 1] | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
third_party/blink/web_tests/compositing/overflow/ancestor-with-clip-path-expected.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <!DOCTYPE HTML> | ||
| <style> | ||
| #scroller { | ||
| overflow: scroll; | ||
| height: 300px; | ||
| width: 300px; | ||
| background-color: red; | ||
| } | ||
|
|
||
| #outer { | ||
| height: 800px; | ||
| width: 250px; | ||
| background-color: blue; | ||
| clip-path: polygon(40px 550px,432px 302px,409px 237px,46px 156px); | ||
| } | ||
|
|
||
| #scrolled { | ||
| height: 1000px; | ||
| width: 250px; | ||
| background-color: green; | ||
| } | ||
|
|
||
| #fixed { | ||
| position: fixed; | ||
| height: 100px; | ||
| width: 100px; | ||
| background-color: green; | ||
| top: 400px; | ||
| left: 100px; | ||
| } | ||
| </style> | ||
| <div id="outer"> | ||
| <div id="scroller"> | ||
| <div id="scrolled"></div> | ||
| <div id="fixed"></div> | ||
| </div> | ||
| </div> |
3 changes: 0 additions & 3 deletions
3
third_party/blink/web_tests/compositing/overflow/ancestor-with-clip-path-expected.txt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
third_party/blink/web_tests/compositing/overflow/descendant-with-clip-path-expected.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <!DOCTYPE HTML> | ||
| <style> | ||
| #scroller { | ||
| overflow: scroll; | ||
| height: 300px; | ||
| width: 300px; | ||
| background-color: red; | ||
| } | ||
|
|
||
| #inner { | ||
| height: 1000px; | ||
| width: 250px; | ||
| background-color: blue; | ||
| clip-path: polygon(40px 550px,432px 302px,409px 237px,46px 156px); | ||
| } | ||
|
|
||
| #fixed { | ||
| position: fixed; | ||
| height: 100px; | ||
| width: 100px; | ||
| background-color: green; | ||
| top: 400px; | ||
| left: 100px; | ||
| } | ||
| </style> | ||
| <div id="scroller"> | ||
| <div id="inner"> | ||
| <div id="fixed"></div> | ||
| </div> | ||
| </div> |
3 changes: 0 additions & 3 deletions
3
third_party/blink/web_tests/compositing/overflow/descendant-with-clip-path-expected.txt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 0 additions & 4 deletions
4
third_party/blink/web_tests/compositing/overflow/opt-in-if-composited-expected.txt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.