| Index: cc/trees/clip_node.cc
|
| diff --git a/cc/trees/clip_node.cc b/cc/trees/clip_node.cc
|
| index d3c1863d4482247acccae0ab4e2fc76a680e262d..33aefc604ae0e62ba36a4f5149f93e8606f283b2 100644
|
| --- a/cc/trees/clip_node.cc
|
| +++ b/cc/trees/clip_node.cc
|
| @@ -21,7 +21,6 @@ ClipNode::ClipNode()
|
| target_effect_id(EffectTree::kInvalidNodeId),
|
| layer_clipping_uses_only_local_clip(false),
|
| layers_are_clipped(false),
|
| - layers_are_clipped_when_surfaces_disabled(false),
|
| resets_clip(false) {}
|
|
|
| ClipNode::ClipNode(const ClipNode& other)
|
| @@ -38,8 +37,6 @@ ClipNode::ClipNode(const ClipNode& other)
|
| layer_clipping_uses_only_local_clip(
|
| other.layer_clipping_uses_only_local_clip),
|
| layers_are_clipped(other.layers_are_clipped),
|
| - layers_are_clipped_when_surfaces_disabled(
|
| - other.layers_are_clipped_when_surfaces_disabled),
|
| resets_clip(other.resets_clip) {
|
| if (other.clip_expander) {
|
| DCHECK_EQ(clip_type, ClipType::EXPANDS_CLIP);
|
| @@ -61,8 +58,6 @@ ClipNode& ClipNode::operator=(const ClipNode& other) {
|
| layer_clipping_uses_only_local_clip =
|
| other.layer_clipping_uses_only_local_clip;
|
| layers_are_clipped = other.layers_are_clipped;
|
| - layers_are_clipped_when_surfaces_disabled =
|
| - other.layers_are_clipped_when_surfaces_disabled;
|
| resets_clip = other.resets_clip;
|
|
|
| if (other.clip_expander) {
|
| @@ -95,8 +90,6 @@ bool ClipNode::operator==(const ClipNode& other) const {
|
| layer_clipping_uses_only_local_clip ==
|
| other.layer_clipping_uses_only_local_clip &&
|
| layers_are_clipped == other.layers_are_clipped &&
|
| - layers_are_clipped_when_surfaces_disabled ==
|
| - other.layers_are_clipped_when_surfaces_disabled &&
|
| resets_clip == other.resets_clip;
|
| }
|
|
|
| @@ -112,8 +105,6 @@ void ClipNode::AsValueInto(base::trace_event::TracedValue* value) const {
|
| value->SetBoolean("layer_clipping_uses_only_local_clip",
|
| layer_clipping_uses_only_local_clip);
|
| value->SetBoolean("layers_are_clipped", layers_are_clipped);
|
| - value->SetBoolean("layers_are_clipped_when_surfaces_disabled",
|
| - layers_are_clipped_when_surfaces_disabled);
|
| value->SetBoolean("resets_clip", resets_clip);
|
| }
|
|
|
|
|