| Index: cc/layers/layer.h
|
| diff --git a/cc/layers/layer.h b/cc/layers/layer.h
|
| index ef5da3359dcdbb11e1b719f4fa0b30ceeb33d280..4919bf19488f0160c261d75e1f1ad43878e9c6a4 100644
|
| --- a/cc/layers/layer.h
|
| +++ b/cc/layers/layer.h
|
| @@ -330,13 +330,11 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| virtual void SetLayerTreeHost(LayerTreeHost* host);
|
|
|
| virtual bool HasDelegatedContent() const;
|
| + bool IsDrawnFromPropertyTrees() const;
|
| bool HasContributingDelegatedRenderPasses() const { return false; }
|
|
|
| void SetIsDrawable(bool is_drawable);
|
|
|
| - void SetHideLayerAndSubtree(bool hide);
|
| - bool hide_layer_and_subtree() const { return hide_layer_and_subtree_; }
|
| -
|
| void SetReplicaLayer(Layer* layer);
|
| Layer* replica_layer() { return replica_layer_.get(); }
|
| const Layer* replica_layer() const { return replica_layer_.get(); }
|
| @@ -558,12 +556,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| bool layer_or_descendant_is_drawn();
|
| void set_sorted_for_recursion(bool sorted_for_recursion);
|
| bool sorted_for_recursion();
|
| - 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();
|
| - }
|
|
|
| // LayerAnimationValueProvider implementation.
|
| gfx::ScrollOffset ScrollOffsetForAnimation() const override;
|
| @@ -733,7 +725,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| bool is_container_for_fixed_position_layers_ : 1;
|
| bool is_drawable_ : 1;
|
| bool draws_content_ : 1;
|
| - bool hide_layer_and_subtree_ : 1;
|
| bool masks_to_bounds_ : 1;
|
| bool contents_opaque_ : 1;
|
| bool double_sided_ : 1;
|
| @@ -790,7 +781,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
|
|
| std::vector<FrameTimingRequest> frame_timing_requests_;
|
| bool frame_timing_requests_dirty_;
|
| - bool is_hidden_from_property_trees_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Layer);
|
| };
|
|
|