Index: cc/layers/layer_impl.h |
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h |
index f0b482cc5cbffdb7754d55fbeabb356bb809b6a4..a5f41f98075e5e24902f421c2dca1adb0eb6288b 100644 |
--- a/cc/layers/layer_impl.h |
+++ b/cc/layers/layer_impl.h |
@@ -147,7 +147,7 @@ class CC_EXPORT LayerImpl { |
void UpdatePropertyTreeTransform(); |
void UpdatePropertyTreeTransformIsAnimated(bool is_animated); |
- void UpdatePropertyTreeOpacity(); |
+ void UpdatePropertyTreeOpacity(float opacity); |
void UpdatePropertyTreeScrollOffset(); |
// For compatibility with Layer. |
@@ -239,8 +239,7 @@ class CC_EXPORT LayerImpl { |
void SetContentsOpaque(bool opaque); |
bool contents_opaque() const { return contents_opaque_; } |
- void SetOpacity(float opacity); |
- float opacity() const { return opacity_; } |
+ float Opacity() const; |
bool OpacityIsAnimating() const; |
bool HasPotentiallyRunningOpacityAnimation() const; |
@@ -600,7 +599,6 @@ class CC_EXPORT LayerImpl { |
SkColor background_color_; |
SkColor safe_opaque_background_color_; |
- float opacity_; |
SkXfermode::Mode blend_mode_; |
// draw_blend_mode may be different than blend_mode_, |
// when a RenderSurface re-parents the layer's blend_mode. |