Index: cc/layer_impl.h |
diff --git a/cc/layer_impl.h b/cc/layer_impl.h |
index f773c138e462196cc0b56acb725c3407317a57c2..ef8c1764afb216a4b2d32263a45540bee149ee7f 100644 |
--- a/cc/layer_impl.h |
+++ b/cc/layer_impl.h |
@@ -139,8 +139,8 @@ public: |
void setUseParentBackfaceVisibility(bool useParentBackfaceVisibility) { m_useParentBackfaceVisibility = useParentBackfaceVisibility; } |
bool useParentBackfaceVisibility() const { return m_useParentBackfaceVisibility; } |
- void setUseLCDText(bool useLCDText) { m_useLCDText = useLCDText; } |
- bool useLCDText() const { return m_useLCDText; } |
+ void setCanUseLCDText(bool useLCDText) { m_canUseLCDText = useLCDText; } |
+ bool useCanLCDText() const { return m_canUseLCDText; } |
void setSublayerTransform(const WebKit::WebTransformationMatrix&); |
const WebKit::WebTransformationMatrix& sublayerTransform() const { return m_sublayerTransform; } |
@@ -165,6 +165,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; } |
LayerImpl* renderTarget() const { DCHECK(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; } |
void setRenderTarget(LayerImpl* target) { m_renderTarget = target; } |
@@ -348,7 +350,7 @@ private: |
bool m_drawCheckerboardForMissingTiles; |
WebKit::WebTransformationMatrix m_sublayerTransform; |
WebKit::WebTransformationMatrix m_transform; |
- bool m_useLCDText; |
+ bool m_canUseLCDText; |
bool m_drawsContent; |
bool m_forceRenderSurface; |
@@ -373,6 +375,7 @@ private: |
float m_drawDepth; |
float m_drawOpacity; |
bool m_drawOpacityIsAnimating; |
+ bool m_screenSpaceOpacityIsAnimating; |
// Debug borders. |
SkColor m_debugBorderColor; |