| Index: cc/layers/layer_impl.h
|
| diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
|
| index 48e9529f3d37a21087bf325dd567c92cd0efbc48..753a24df8df361c041d9d6ab7a7cb5c7c891b68f 100644
|
| --- a/cc/layers/layer_impl.h
|
| +++ b/cc/layers/layer_impl.h
|
| @@ -320,7 +320,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| bool contents_opaque() const { return contents_opaque_; }
|
|
|
| void SetOpacity(float opacity);
|
| - float opacity() const { return opacity_; }
|
| + float opacity() const { return hide_layer_and_subtree_ ? 0.f : opacity_; }
|
| bool OpacityIsAnimating() const;
|
| bool HasPotentiallyRunningOpacityAnimation() const;
|
| bool OpacityIsAnimatingOnImplOnly() const;
|
| @@ -685,13 +685,7 @@ 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;
|
|
|
| float GetIdealContentsScale() const;
|
|
|
| @@ -895,7 +889,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);
|
| };
|
|
|