| Index: cc/layer_tree_host.cc
|
| diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
|
| index e2cecda52b6bae89b923f1999bb95ce57ae37b5d..3c3bd8052329a72e2e5e28a6d9b395c2524a1092 100644
|
| --- a/cc/layer_tree_host.cc
|
| +++ b/cc/layer_tree_host.cc
|
| @@ -103,6 +103,7 @@ LayerTreeSettings::LayerTreeSettings()
|
| , pageScalePinchZoomEnabled(false)
|
| , backgroundColorInsteadOfCheckerboard(false)
|
| , showOverdrawInTracing(false)
|
| + , canUseLCDText(true)
|
| , refreshRate(0)
|
| , maxPartialTextureUpdates(std::numeric_limits<size_t>::max())
|
| , numRasterThreads(1)
|
| @@ -116,6 +117,12 @@ LayerTreeSettings::LayerTreeSettings()
|
| backgroundColorInsteadOfCheckerboard = CommandLine::ForCurrentProcess()->HasSwitch(switches::kBackgroundColorInsteadOfCheckerboard);
|
| showOverdrawInTracing = CommandLine::ForCurrentProcess()->HasSwitch(switches::kTraceOverdraw);
|
|
|
| +// TODO(alokp): Remove this hard-coded setting.
|
| +// Platforms that need to disable LCD text must explicitly set this value.
|
| +#if defined(OS_ANDROID)
|
| + canUseLCDText = false;
|
| +#endif
|
| +
|
| initialDebugState.showPropertyChangedRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowPropertyChangedRects);
|
| initialDebugState.showSurfaceDamageRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowSurfaceDamageRects);
|
| initialDebugState.showScreenSpaceRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowScreenSpaceRects);
|
| @@ -681,7 +688,7 @@ void LayerTreeHost::updateLayers(Layer* rootLayer, ResourceUpdateQueue& queue)
|
| }
|
|
|
| TRACE_EVENT0("cc", "LayerTreeHost::updateLayers::calcDrawEtc");
|
| - LayerTreeHostCommon::calculateDrawProperties(rootLayer, deviceViewportSize(), m_deviceScaleFactor, m_pageScaleFactor, rendererCapabilities().maxTextureSize, updateList);
|
| + LayerTreeHostCommon::calculateDrawProperties(rootLayer, deviceViewportSize(), m_deviceScaleFactor, m_pageScaleFactor, rendererCapabilities().maxTextureSize, m_settings.canUseLCDText, updateList);
|
| }
|
|
|
| // Reset partial texture update requests.
|
|
|