Index: cc/tiled_layer.cc |
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc |
index b152bfae6468790570d37005a8b21df8ece6e1d7..cb2a2c8748fb9b7faefd6d406b2d3dfe5d975e22 100644 |
--- a/cc/tiled_layer.cc |
+++ b/cc/tiled_layer.cc |
@@ -275,18 +275,11 @@ void TiledLayer::setNeedsDisplayRect(const gfx::RectF& dirtyRect) |
ContentsScalingLayer::setNeedsDisplayRect(dirtyRect); |
} |
-void TiledLayer::setUseLCDText(bool useLCDText) |
-{ |
- ContentsScalingLayer::setUseLCDText(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); |
+void TiledLayer::setCanUseLCDText(bool useLCDText) |
+{ |
+ ContentsScalingLayer::setCanUseLCDText(useLCDText); |
+ |
+ setBorderTexelOption(useLCDText ? LayerTilingData::NoBorderTexels : LayerTilingData::HasBorderTexels); |
danakj
2012/11/10 01:12:35
Is this change needed here, since useLCDText shoul
alokp
2012/11/12 01:04:45
Not necessary, but now there is no need for this c
danakj
2012/11/12 01:25:47
Yah, Ok :)
|
} |
void TiledLayer::invalidateContentRect(const gfx::Rect& contentRect) |