Mark layers that can use LCD text based on layer transform and opacity.

webkit/compositor_bindings/web_content_layer_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "web_content_layer_impl.h"
 
 #include "SkMatrix44.h"
 #include "base/command_line.h"
 #include "cc/content_layer.h"
 #include "cc/picture_layer.h"
@@ skipping 54 matching lines @@
 bool WebContentLayerImpl::boundsContainPageScale() const
 {
     return m_layer->layer()->boundsContainPageScale();
 }
 
 void WebContentLayerImpl::setAutomaticallyComputeRasterScale(bool automatic)
 {
   m_layer->layer()->setAutomaticallyComputeRasterScale(automatic);
 }
 
+// TODO(alokp): Remove this function from WebContentLayer API.
 void WebContentLayerImpl::setUseLCDText(bool enable)
 {
-    m_layer->layer()->setUseLCDText(enable);
 }
 
 void WebContentLayerImpl::setDrawCheckerboardForMissingTiles(bool enable)
 {
     m_layer->layer()->setDrawCheckerboardForMissingTiles(enable);
 }
 
 
 void WebContentLayerImpl::paintContents(SkCanvas* canvas, const gfx::Rect& clip, gfx::RectF& opaque)
 {
     if (!m_client)
         return;
+
+    bool useLCDText = usingPictureLayer() ?
+            false :
+            static_cast<ContentLayer*>(m_layer->layer())->useLCDText();
     WebFloatRect webOpaque;
     m_client->paintContents(canvas,
                             clip,
 #if WEBCONTENTLAYERCLIENT_HAS_CANPAINTLCDTEXT
-                            m_layer->layer()->useLCDText(),
+                            useLCDText,
 #endif  // WEBCONTENTLAYERCLIENT_HAS_CANPAINTLCDTEXT
                             webOpaque);
     opaque = webOpaque;
 }
 
 } // namespace WebKit