diff options
Diffstat (limited to 'chromium/cc/trees/effect_node.cc')
| -rw-r--r-- | chromium/cc/trees/effect_node.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/chromium/cc/trees/effect_node.cc b/chromium/cc/trees/effect_node.cc index 339be0b576b..b84952f357e 100644 --- a/chromium/cc/trees/effect_node.cc +++ b/chromium/cc/trees/effect_node.cc @@ -31,7 +31,6 @@ EffectNode::EffectNode() is_currently_animating_backdrop_filter(false), is_currently_animating_opacity(false), has_masking_child(false), - is_masked(false), effect_changed(false), subtree_has_copy_request(false), is_fast_rounded_corner(false), @@ -39,7 +38,6 @@ EffectNode::EffectNode() transform_id(0), 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) {} @@ -66,7 +64,6 @@ bool EffectNode::operator==(const EffectNode& other) const { HasRenderSurface() == other.HasRenderSurface() && blend_mode == other.blend_mode && surface_contents_scale == other.surface_contents_scale && - unscaled_mask_target_size == other.unscaled_mask_target_size && hidden_by_backface_visibility == other.hidden_by_backface_visibility && double_sided == other.double_sided && trilinear_filtering == other.trilinear_filtering && @@ -83,11 +80,10 @@ bool EffectNode::operator==(const EffectNode& other) const { is_currently_animating_opacity == other.is_currently_animating_opacity && has_masking_child == other.has_masking_child && - is_masked == other.is_masked && effect_changed == other.effect_changed && 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 && + target_id == other.target_id && closest_ancestor_with_cached_render_surface_id == other.closest_ancestor_with_cached_render_surface_id && closest_ancestor_with_copy_request_id == @@ -126,8 +122,6 @@ const char* RenderSurfaceReasonToString(RenderSurfaceReason reason) { return "clip axis alignment"; case RenderSurfaceReason::kMask: return "mask"; - case RenderSurfaceReason::kRootOrIsolatedGroup: - return "root or isolated group"; case RenderSurfaceReason::kTrilinearFiltering: return "trilinear filtering"; case RenderSurfaceReason::kCache: @@ -144,7 +138,7 @@ const char* RenderSurfaceReasonToString(RenderSurfaceReason reason) { void EffectNode::AsValueInto(base::trace_event::TracedValue* value) const { value->SetInteger("backdrop_mask_element_id", - backdrop_mask_element_id.GetInternalValue()); + backdrop_mask_element_id.GetStableId()); value->SetInteger("id", id); value->SetInteger("parent_id", parent_id); value->SetInteger("stable_id", stable_id); @@ -171,7 +165,6 @@ void EffectNode::AsValueInto(base::trace_event::TracedValue* value) const { value->SetBoolean("has_potential_opacity_animation", has_potential_opacity_animation); value->SetBoolean("has_masking_child", has_masking_child); - value->SetBoolean("is_masked", is_masked); value->SetBoolean("effect_changed", effect_changed); value->SetBoolean("subtree_has_copy_request", subtree_has_copy_request); value->SetString("render_surface_reason", @@ -179,7 +172,6 @@ void EffectNode::AsValueInto(base::trace_event::TracedValue* value) const { value->SetInteger("transform_id", transform_id); 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", |