Index: cc/layers/layer_impl.h |
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h |
index 12ee4c0b7e76227d49a67e3120bf9cf1e5fb314b..e3d0c877e4d96c5ba71dfec1c2db07835e986eaf 100644 |
--- a/cc/layers/layer_impl.h |
+++ b/cc/layers/layer_impl.h |
@@ -321,6 +321,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
void SetOpacity(float opacity); |
float opacity() const { return opacity_; } |
+ float EffectiveOpacity() const; |
bool OpacityIsAnimating() const; |
bool HasPotentiallyRunningOpacityAnimation() const; |
bool OpacityIsAnimatingOnImplOnly() const; |
@@ -685,13 +686,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 +890,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); |
}; |