forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix the case where an element contains both filter and backdrop-filter
Previous to this CL, if an element was styled with both filter and backdrop-filter, the filter effect was not properly applied to the filtered backdrop contents, because a separate filter property node gets created for the filter, and the backdrop-filter effect node does not contain the filters. With this CL, paint_layer appends the filters to the backdrop-filters list, so that Viz has access to those. Bug: 973907 Change-Id: I255b73433d75e0551d817134fa50d5e0e35b87df Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1658654 Commit-Queue: Mason Freed <masonfreed@chromium.org> Auto-Submit: Mason Freed <masonfreed@chromium.org> Reviewed-by: enne <enne@chromium.org> Cr-Commit-Position: refs/heads/master@{#669006}
- Loading branch information
Showing
9 changed files
with
120 additions
and
55 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
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
Binary file removed
BIN
-7.01 KB
third_party/blink/web_tests/css3/filters/backdrop-filter-plus-filter-expected.png
Binary file not shown.
36 changes: 0 additions & 36 deletions
36
third_party/blink/web_tests/css3/filters/backdrop-filter-plus-filter.html
This file was deleted.
Oops, something went wrong.
49 changes: 49 additions & 0 deletions
49
...arty/blink/web_tests/external/wpt/css/filter-effects/backdrop-filter-plus-filter-ref.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,49 @@ | ||
| <!DOCTYPE html> | ||
| <meta charset="utf-8"> | ||
| <title>backdrop-filter: Only filter objects painted before</title> | ||
| <link rel="author" title="Mason Freed" href="mailto:masonfreed@chromium.org"> | ||
|
|
||
|
|
||
|
|
||
| <p>Expected: A green box with an overlapping purple box.<br> | ||
| The overlapping portion of the boxes should be bright magenta.<br> | ||
|
|
||
| <div class="container"> | ||
| <div class="orangebox"></div> | ||
| <div class="bluebox blur-bd"></div> | ||
| <div class="invert"></div> | ||
| </div> | ||
|
|
||
|
|
||
| <style> | ||
| div { | ||
| position: absolute; | ||
| width: 100px; | ||
| height: 100px; | ||
| } | ||
| .container { | ||
| width:200px; | ||
| height:200px; | ||
| top: 50px; | ||
| position:absolute; | ||
| } | ||
| .blur-bd { | ||
| backdrop-filter: blur(10px); | ||
| } | ||
| .orangebox { | ||
| left: 10px; | ||
| top: 50px; | ||
| background: green; | ||
| } | ||
| .bluebox { | ||
| left: 60px; | ||
| top: 110px; | ||
| background: #00ff0055; | ||
| } | ||
| .invert { | ||
| left: 60px; | ||
| top: 110px; | ||
| background: transparent; | ||
| backdrop-filter: invert(1); | ||
| } | ||
| </style> |
45 changes: 45 additions & 0 deletions
45
third_party/blink/web_tests/external/wpt/css/filter-effects/backdrop-filter-plus-filter.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,45 @@ | ||
| <!DOCTYPE html> | ||
| <meta charset="utf-8"> | ||
| <title>backdrop-filter: Correctly apply filters to backdrop-filter content</title> | ||
| <link rel="author" title="Mason Freed" href="mailto:masonfreed@chromium.org"> | ||
| <link rel="help" href="https://drafts.fxtf.org/filter-effects-2/#BackdropFilterProperty"> | ||
| <link rel="match" href="backdrop-filter-plus-filter-ref.html"> | ||
|
|
||
| <p>Expected: A green box with an overlapping purple box.<br> | ||
| The overlapping portion of the boxes should be bright magenta.<br> | ||
|
|
||
| <div class="container"> | ||
| <div class="orangebox"></div> | ||
| <div class="bluebox blur blur-bd"></div> | ||
| </div> | ||
|
|
||
|
|
||
| <style> | ||
| div { | ||
| position: absolute; | ||
| width: 100px; | ||
| height: 100px; | ||
| } | ||
| .container { | ||
| width:200px; | ||
| height:200px; | ||
| top: 50px; | ||
| position:absolute; | ||
| } | ||
| .blur { | ||
| filter: invert(1); | ||
| } | ||
| .blur-bd { | ||
| backdrop-filter: blur(10px); | ||
| } | ||
| .orangebox { | ||
| left: 10px; | ||
| top: 50px; | ||
| background: green; | ||
| } | ||
| .bluebox { | ||
| left: 60px; | ||
| top: 110px; | ||
| background: #00ff0055; | ||
| } | ||
| </style> |
Binary file removed
BIN
-18.6 KB
...ts/virtual/scalefactor200/css3/filters/backdrop-filter-plus-filter-expected.png
Binary file not shown.