Index: cc/layer.cc |
diff --git a/cc/layer.cc b/cc/layer.cc |
index e300fe08c7278d2a6c5b6ec7f2c31c1e245f6a0e..92445a5d9fe4c0a3f4091584550b8b611daea78f 100644 |
--- a/cc/layer.cc |
+++ b/cc/layer.cc |
@@ -53,7 +53,7 @@ Layer::Layer() |
, m_masksToBounds(false) |
, m_contentsOpaque(false) |
, m_doubleSided(true) |
- , m_useLCDText(false) |
+ , m_canUseLCDText(false) |
, m_preserves3D(false) |
, m_useParentBackfaceVisibility(false) |
, m_drawCheckerboardForMissingTiles(false) |
@@ -61,6 +61,7 @@ Layer::Layer() |
, m_replicaLayer(0) |
, m_drawOpacity(0) |
, m_drawOpacityIsAnimating(false) |
+ , m_screenSpaceOpacityIsAnimating(false) |
, m_renderTarget(0) |
, m_drawTransformIsAnimating(false) |
, m_screenSpaceTransformIsAnimating(false) |
@@ -88,9 +89,9 @@ Layer::~Layer() |
SkSafeUnref(m_filter); |
} |
-void Layer::setUseLCDText(bool useLCDText) |
+void Layer::setCanUseLCDText(bool useLCDText) |
{ |
- m_useLCDText = useLCDText; |
+ m_canUseLCDText = useLCDText; |
} |
void Layer::setLayerTreeHost(LayerTreeHost* host) |
@@ -575,7 +576,7 @@ void Layer::pushPropertiesTo(LayerImpl* layer) |
layer->setFilters(filters()); |
layer->setFilter(filter()); |
layer->setBackgroundFilters(backgroundFilters()); |
- layer->setUseLCDText(m_useLCDText); |
+ layer->setCanUseLCDText(m_canUseLCDText); |
layer->setMasksToBounds(m_masksToBounds); |
layer->setScrollable(m_scrollable); |
layer->setShouldScrollOnMainThread(m_shouldScrollOnMainThread); |