| Index: cc/layers/layer_impl.h
|
| diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
|
| index 990a3848748d6970788038ee0d15f95b8d448c2f..385173b443a3ea235c5314e48248132a69b90c0c 100644
|
| --- a/cc/layers/layer_impl.h
|
| +++ b/cc/layers/layer_impl.h
|
| @@ -288,7 +288,6 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
|
|
| int NumDescendantsThatDrawContent() const;
|
| void SetHideLayerAndSubtree(bool hide);
|
| - bool hide_layer_and_subtree() const { return hide_layer_and_subtree_; }
|
|
|
| void SetTransformOrigin(const gfx::Point3F& transform_origin);
|
| gfx::Point3F transform_origin() const { return transform_origin_; }
|
| @@ -681,13 +680,8 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
|
|
| void UpdatePropertyTreeForScrollingAndAnimationIfNeeded();
|
|
|
| - void set_is_hidden_from_property_trees(bool is_hidden) {
|
| - if (is_hidden == is_hidden_from_property_trees_)
|
| - return;
|
| - is_hidden_from_property_trees_ = is_hidden;
|
| - SetNeedsPushProperties();
|
| - }
|
| - bool LayerIsHidden() const;
|
| + bool IsHidden() const;
|
| + bool IsDrawnFromPropertyTrees() const;
|
|
|
| float GetIdealContentsScale() const;
|
|
|
| @@ -794,7 +788,6 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| bool is_root_for_isolated_group_ : 1;
|
| bool use_parent_backface_visibility_ : 1;
|
| bool draws_content_ : 1;
|
| - bool hide_layer_and_subtree_ : 1;
|
|
|
| // Cache transform_'s invertibility.
|
| bool transform_is_invertible_ : 1;
|
| @@ -892,7 +885,6 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| // If true, the layer or one of its descendants has a wheel or touch handler.
|
| bool layer_or_descendant_has_input_handler_;
|
| bool sorted_for_recursion_;
|
| - bool is_hidden_from_property_trees_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(LayerImpl);
|
| };
|
|
|