| Index: cc/layer_tree_host.cc
|
| diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
|
| index 6ff1ff164aaa948204ada0f01adb0236f6e9a151..c766fd33a29272e4c286e00130d3eec129f36a00 100644
|
| --- a/cc/layer_tree_host.cc
|
| +++ b/cc/layer_tree_host.cc
|
| @@ -45,12 +45,18 @@ LayerTreeSettings::LayerTreeSettings()
|
| , showReplicaScreenSpaceRects(false)
|
| , showOccludingRects(false)
|
| , renderVSyncEnabled(true)
|
| + , canUseLCDText(true)
|
| , refreshRate(0)
|
| , maxPartialTextureUpdates(std::numeric_limits<size_t>::max())
|
| , defaultTileSize(gfx::Size(256, 256))
|
| , maxUntiledLayerSize(gfx::Size(512, 512))
|
| , minimumOcclusionTrackingSize(gfx::Size(160, 160))
|
| {
|
| +// FIXME: Remove this hard-coded setting.
|
| +// Platforms that need to disable LCD text must explicitly set this value.
|
| +#if defined(OS_ANDROID)
|
| + canUseLCDText = false;
|
| +#endif
|
| }
|
|
|
| LayerTreeSettings::~LayerTreeSettings()
|
| @@ -546,7 +552,7 @@ void LayerTreeHost::updateLayers(Layer* rootLayer, ResourceUpdateQueue& queue)
|
| }
|
|
|
| TRACE_EVENT0("cc", "LayerTreeHost::updateLayers::calcDrawEtc");
|
| - LayerTreeHostCommon::calculateDrawTransforms(rootLayer, deviceViewportSize(), m_deviceScaleFactor, m_pageScaleFactor, rendererCapabilities().maxTextureSize, updateList);
|
| + LayerTreeHostCommon::calculateDrawTransforms(rootLayer, deviceViewportSize(), m_deviceScaleFactor, m_pageScaleFactor, rendererCapabilities().maxTextureSize, m_settings.canUseLCDText, updateList);
|
| }
|
|
|
| // Reset partial texture update requests.
|
|
|