summaryrefslogtreecommitdiffstats
path: root/chromium/cc/trees/effect_node.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-03-12 09:13:00 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-03-16 09:58:26 +0000
commit03561cae90f1d99b5c54b1ef3be69f10e882b25e (patch)
treecc5f0958e823c044e7ae51cc0117fe51432abe5e /chromium/cc/trees/effect_node.cc
parentfa98118a45f7e169f8846086dc2c22c49a8ba310 (diff)
BASELINE: Update Chromium to 88.0.4324.208
Change-Id: I3ae87d23e4eff4b4a469685658740a213600c667 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/cc/trees/effect_node.cc')
-rw-r--r--chromium/cc/trees/effect_node.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/chromium/cc/trees/effect_node.cc b/chromium/cc/trees/effect_node.cc
index de8b74caf4a..fa07fea5b79 100644
--- a/chromium/cc/trees/effect_node.cc
+++ b/chromium/cc/trees/effect_node.cc
@@ -60,7 +60,7 @@ bool EffectNode::operator==(const EffectNode& other) const {
backdrop_filters == other.backdrop_filters &&
backdrop_filter_bounds == other.backdrop_filter_bounds &&
backdrop_mask_element_id == other.backdrop_mask_element_id &&
- rounded_corner_bounds == other.rounded_corner_bounds &&
+ mask_filter_info == other.mask_filter_info &&
is_fast_rounded_corner == other.is_fast_rounded_corner &&
node_or_ancestor_has_filters == other.node_or_ancestor_has_filters &&
affected_by_backdrop_filter == other.affected_by_backdrop_filter &&
@@ -158,12 +158,18 @@ void EffectNode::AsValueInto(base::trace_event::TracedValue* value) const {
if (!backdrop_filters.IsEmpty())
value->SetString("backdrop_filters", backdrop_filters.ToString());
value->SetDouble("backdrop_filter_quality", backdrop_filter_quality);
- value->SetBoolean("is_fast_rounded_corner", is_fast_rounded_corner);
value->SetBoolean("node_or_ancestor_has_filters",
node_or_ancestor_has_filters);
- if (!rounded_corner_bounds.IsEmpty()) {
- MathUtil::AddToTracedValue("rounded_corner_bounds", rounded_corner_bounds,
+ if (!mask_filter_info.IsEmpty()) {
+ MathUtil::AddToTracedValue("mask_filter_bounds", mask_filter_info.bounds(),
value);
+ if (mask_filter_info.HasRoundedCorners()) {
+ MathUtil::AddCornerRadiiToTracedValue(
+ "mask_filter_rounded_corner_raii",
+ mask_filter_info.rounded_corner_bounds(), value);
+ value->SetBoolean("mask_filter_is_fast_rounded_corner",
+ is_fast_rounded_corner);
+ }
}
value->SetString("blend_mode", SkBlendMode_Name(blend_mode));
value->SetBoolean("cache_render_surface", cache_render_surface);