| Index: cc/layer.cc
|
| diff --git a/cc/layer.cc b/cc/layer.cc
|
| index 29fe62a8bfa0b955ca2ced34595e9b4de3e93edb..e7fef20a2176545de924f21cdbdc042e23b962e7 100644
|
| --- a/cc/layer.cc
|
| +++ b/cc/layer.cc
|
| @@ -55,7 +55,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)
|
| @@ -63,6 +63,7 @@ Layer::Layer()
|
| , m_replicaLayer(0)
|
| , m_drawOpacity(0)
|
| , m_drawOpacityIsAnimating(false)
|
| + , m_screenSpaceOpacityIsAnimating(false)
|
| , m_renderTarget(0)
|
| , m_drawTransformIsAnimating(false)
|
| , m_screenSpaceTransformIsAnimating(false)
|
| @@ -90,9 +91,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)
|
| @@ -577,7 +578,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);
|
|
|