diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/cc/trees/effect_node.cc | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/cc/trees/effect_node.cc')
| -rw-r--r-- | chromium/cc/trees/effect_node.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/chromium/cc/trees/effect_node.cc b/chromium/cc/trees/effect_node.cc index 7a556277530..ce158903ba1 100644 --- a/chromium/cc/trees/effect_node.cc +++ b/chromium/cc/trees/effect_node.cc @@ -12,11 +12,12 @@ namespace cc { EffectNode::EffectNode() : id(EffectTree::kInvalidNodeId), parent_id(EffectTree::kInvalidNodeId), - owning_layer_id(Layer::INVALID_ID), + stable_id(INVALID_STABLE_ID), opacity(1.f), screen_space_opacity(1.f), blend_mode(SkBlendMode::kSrcOver), has_render_surface(false), + cache_render_surface(false), has_copy_request(false), hidden_by_backface_visibility(false), double_sided(false), @@ -32,15 +33,17 @@ EffectNode::EffectNode() clip_id(0), target_id(1), mask_layer_id(Layer::INVALID_ID), + closest_ancestor_with_cached_render_surface_id(-1), closest_ancestor_with_copy_request_id(-1) {} EffectNode::EffectNode(const EffectNode& other) = default; bool EffectNode::operator==(const EffectNode& other) const { return id == other.id && parent_id == other.parent_id && - owning_layer_id == other.owning_layer_id && opacity == other.opacity && + stable_id == other.stable_id && opacity == other.opacity && screen_space_opacity == other.screen_space_opacity && has_render_surface == other.has_render_surface && + cache_render_surface == other.cache_render_surface && has_copy_request == other.has_copy_request && filters == other.filters && background_filters == other.background_filters && @@ -62,6 +65,8 @@ bool EffectNode::operator==(const EffectNode& other) const { subtree_has_copy_request == other.subtree_has_copy_request && transform_id == other.transform_id && clip_id == other.clip_id && target_id == other.target_id && mask_layer_id == other.mask_layer_id && + closest_ancestor_with_cached_render_surface_id == + other.closest_ancestor_with_cached_render_surface_id && closest_ancestor_with_copy_request_id == other.closest_ancestor_with_copy_request_id; } @@ -69,9 +74,10 @@ bool EffectNode::operator==(const EffectNode& other) const { void EffectNode::AsValueInto(base::trace_event::TracedValue* value) const { value->SetInteger("id", id); value->SetInteger("parent_id", parent_id); - value->SetInteger("owning_layer_id", owning_layer_id); + value->SetInteger("stable_id", stable_id); value->SetDouble("opacity", opacity); value->SetBoolean("has_render_surface", has_render_surface); + value->SetBoolean("cache_render_surface", cache_render_surface); value->SetBoolean("has_copy_request", has_copy_request); value->SetBoolean("double_sided", double_sided); value->SetBoolean("is_drawn", is_drawn); @@ -85,6 +91,8 @@ void EffectNode::AsValueInto(base::trace_event::TracedValue* value) const { value->SetInteger("clip_id", clip_id); value->SetInteger("target_id", target_id); value->SetInteger("mask_layer_id", mask_layer_id); + value->SetInteger("closest_ancestor_with_cached_render_surface_id", + closest_ancestor_with_cached_render_surface_id); value->SetInteger("closest_ancestor_with_copy_request_id", closest_ancestor_with_copy_request_id); } |