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 "config.h"
 
 #include "cc/tiled_layer.h"
 
 #include "base/basictypes.h"
 #include "cc/geometry.h"
@@ skipping 257 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)
 {
-    ContentsScalingLayer::setUseLCDText(useLCDText);
+    ContentsScalingLayer::setCanUseLCDText(useLCDText);
 
-    LayerTilingData::BorderTexelOption borderTexelOption;
-#if 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);

[danakj, 2012/11/10 01:12:35]

Is this change needed here, since useLCDText should always be false anyways, due
to the other ifdef? This seems like it better belongs in the CL to untangle
these two things?

[alokp, 2012/11/12 01:04:45]

Not necessary, but now there is no need for this code anymore. Why have
unnecessary code?

[danakj, 2012/11/12 01:25:47]

Yah, Ok :)

 }
 
 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 476 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