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

cc/tiled_layer.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 "cc/tiled_layer.h"
 
 #include "base/basictypes.h"
 #include "build/build_config.h"
 #include "cc/geometry.h"
 #include "cc/layer_impl.h"
@@ skipping 254 matching lines @@
 
     return addedTile;
 }
 
 void TiledLayer::setNeedsDisplayRect(const gfx::RectF& dirtyRect)
 {
     invalidateContentRect(layerRectToContentRect(dirtyRect));
     ContentsScalingLayer::setNeedsDisplayRect(dirtyRect);
 }
 
-void TiledLayer::setUseLCDText(bool useLCDText)
+void TiledLayer::setCanUseLCDText(bool useLCDText)

[enne (OOO), 2012/11/14 17:42:15]

Where's the invalidation here if this setting changes?

[alokp, 2012/11/16 04:41:11]

It was indirectly happening when tile layers were reset due to
setBorderTexelOption. But now that http://codereview.chromium.org/11360205/ has
landed, I have added an explicit invalidation in
ContentLayer::canUseLCDTextDidChange. I also added a unit-test to verify the
invalidation.

[enne (OOO), 2012/11/16 17:36:38]

Ah, great.  Thanks for the unit test.  :)

 {
-    ContentsScalingLayer::setUseLCDText(useLCDText);
+    ContentsScalingLayer::setCanUseLCDText(useLCDText);
 
-    LayerTilingData::BorderTexelOption borderTexelOption;
-#if defined(OS_ANDROID)
-    // Always want border texels and GL_LINEAR due to pinch zoom.
-    borderTexelOption = LayerTilingData::HasBorderTexels;
-#else
-    borderTexelOption = useLCDText ? LayerTilingData::NoBorderTexels : LayerTilingData::HasBorderTexels;
-#endif
-    setBorderTexelOption(borderTexelOption);
+    setBorderTexelOption(useLCDText ? LayerTilingData::NoBorderTexels : LayerTilingData::HasBorderTexels);
 }
 
 void TiledLayer::invalidateContentRect(const gfx::Rect& contentRect)
 {
     updateBounds();
     if (m_tiler->isEmpty() || contentRect.IsEmpty() || m_skipsDraw)
         return;
 
     for (LayerTilingData::TileMap::const_iterator iter = m_tiler->tiles().begin(); iter != m_tiler->tiles().end(); ++iter) {
         UpdatableTile* tile = static_cast<UpdatableTile*>(iter->second);
@@ skipping 470 matching lines @@
     gfx::Rect prepaintRect = visibleContentRect();
     prepaintRect.Inset(-m_tiler->tileSize().width() * prepaintColumns,
                        -m_tiler->tileSize().height() * prepaintRows);
     gfx::Rect contentRect(gfx::Point(), contentBounds());
     prepaintRect.Intersect(contentRect);
 
     return prepaintRect;
 }
 
 }  // namespace cc