Index: cc/layer_tree_host.cc |
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc |
index 9194e1482797750bda1ec92c0045f3c5538373bc..7b93d78ed74d1edab3138d80205980488123e425 100644 |
--- a/cc/layer_tree_host.cc |
+++ b/cc/layer_tree_host.cc |
@@ -104,6 +104,7 @@ LayerTreeSettings::LayerTreeSettings() |
, pageScalePinchZoomEnabled(false) |
, backgroundColorInsteadOfCheckerboard(false) |
, showOverdrawInTracing(false) |
+ , canUseLCDText(true) |
, refreshRate(0) |
, maxPartialTextureUpdates(std::numeric_limits<size_t>::max()) |
, numRasterThreads(1) |
@@ -117,6 +118,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); |
@@ -682,7 +689,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. |