Index: cc/layers/layer.h |
diff --git a/cc/layers/layer.h b/cc/layers/layer.h |
index 94f827139fe9205e7a3df7468287e7b84224e65b..74fa72b31bff8ed3e23bb81ca623ce98be9b0589 100644 |
--- a/cc/layers/layer.h |
+++ b/cc/layers/layer.h |
@@ -141,6 +141,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>, |
void SetOpacity(float opacity); |
float opacity() const { return opacity_; } |
+ float EffectiveOpacity() const; |
bool OpacityIsAnimating() const; |
bool HasPotentiallyRunningOpacityAnimation() const; |
virtual bool OpacityCanAnimateOnImplThread() const; |
@@ -560,12 +561,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; |
@@ -792,7 +787,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); |
}; |