summaryrefslogtreecommitdiffstats
path: root/chromium/cc/trees/effect_node.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-05-17 17:24:03 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-06-22 07:51:41 +0000
commit774f54339e5db91f785733232d3950366db65d07 (patch)
tree068e1b47bd1af94d77094ed12b604a6b83d9c22a /chromium/cc/trees/effect_node.cc
parentf7eaed5286974984ba5f9e3189d8f49d03e99f81 (diff)
BASELINE: Update Chromium to 102.0.5005.57
Change-Id: I885f714bb40ee724c28f94ca6bd8dbdb39915158 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, 12 insertions, 2 deletions
diff --git a/chromium/cc/trees/effect_node.cc b/chromium/cc/trees/effect_node.cc
index 9a5c5367315..b08f9cf0e5e 100644
--- a/chromium/cc/trees/effect_node.cc
+++ b/chromium/cc/trees/effect_node.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "cc/trees/effect_node.h"
+#include "base/notreached.h"
#include "base/trace_event/traced_value.h"
#include "cc/layers/layer.h"
#include "cc/trees/property_tree.h"
@@ -43,7 +44,8 @@ EffectNode::EffectNode()
target_id(1),
closest_ancestor_with_cached_render_surface_id(-1),
closest_ancestor_with_copy_request_id(-1),
- closest_ancestor_being_captured_id(-1) {}
+ closest_ancestor_being_captured_id(-1),
+ closest_ancestor_with_shared_element_id(-1) {}
EffectNode::EffectNode(const EffectNode& other) = default;
@@ -99,7 +101,9 @@ bool EffectNode::operator==(const EffectNode& other) const {
closest_ancestor_with_copy_request_id ==
other.closest_ancestor_with_copy_request_id &&
closest_ancestor_being_captured_id ==
- other.closest_ancestor_being_captured_id;
+ other.closest_ancestor_being_captured_id &&
+ closest_ancestor_with_shared_element_id ==
+ other.closest_ancestor_with_shared_element_id;
}
#endif // DCHECK_IS_ON()
@@ -131,6 +135,8 @@ const char* RenderSurfaceReasonToString(RenderSurfaceReason reason) {
return "backdrop filter animation";
case RenderSurfaceReason::kRoundedCorner:
return "rounded corner";
+ case RenderSurfaceReason::kGradientMask:
+ return "gradient mask";
case RenderSurfaceReason::kClipPath:
return "clip path";
case RenderSurfaceReason::kClipAxisAlignment:
@@ -181,6 +187,10 @@ void EffectNode::AsValueInto(base::trace_event::TracedValue* value) const {
value->SetBoolean("mask_filter_is_fast_rounded_corner",
is_fast_rounded_corner);
}
+ if (mask_filter_info.HasGradientMask()) {
+ MathUtil::AddToTracedValue("mask_filter_gradient_mask",
+ mask_filter_info.gradient_mask(), value);
+ }
}
value->SetString("blend_mode", SkBlendMode_Name(blend_mode));
value->SetString("subtree_capture_id", subtree_capture_id.ToString());