Index: cc/layer.h |
diff --git a/cc/layer.h b/cc/layer.h |
index caafa9d474d0c243d36223a608da9c0788754804..cec62c69a55eec740a69f63f8b587767944f2753 100644 |
--- a/cc/layer.h |
+++ b/cc/layer.h |
@@ -173,8 +173,8 @@ public: |
void setUseParentBackfaceVisibility(bool useParentBackfaceVisibility) { m_useParentBackfaceVisibility = useParentBackfaceVisibility; } |
bool useParentBackfaceVisibility() const { return m_useParentBackfaceVisibility; } |
- virtual void setUseLCDText(bool); |
- bool useLCDText() const { return m_useLCDText; } |
+ virtual void setCanUseLCDText(bool); |
+ bool canUseLCDText() const { return m_canUseLCDText; } |
virtual void setLayerTreeHost(LayerTreeHost*); |
@@ -211,6 +211,8 @@ public: |
bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; } |
void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityIsAnimating = drawOpacityIsAnimating; } |
+ bool screenSpaceOpacityIsAnimating() const { return m_screenSpaceOpacityIsAnimating; } |
+ void setScreenSpaceOpacityIsAnimating(bool animating) { m_screenSpaceOpacityIsAnimating = animating; } |
Layer* renderTarget() const { DCHECK(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; } |
void setRenderTarget(Layer* target) { m_renderTarget = target; } |
@@ -373,7 +375,7 @@ private: |
bool m_masksToBounds; |
bool m_contentsOpaque; |
bool m_doubleSided; |
- bool m_useLCDText; |
+ bool m_canUseLCDText; |
bool m_preserves3D; |
bool m_useParentBackfaceVisibility; |
bool m_drawCheckerboardForMissingTiles; |
@@ -389,6 +391,7 @@ private: |
scoped_ptr<RenderSurface> m_renderSurface; |
float m_drawOpacity; |
bool m_drawOpacityIsAnimating; |
+ bool m_screenSpaceOpacityIsAnimating; |
Layer* m_renderTarget; |