Chromium Code Reviews| Index: cc/tiled_layer.cc |
| diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc |
| index 4d4a355a62ab310aba79d3589ce82684736f49fb..323dd9276550201ef159ee5893c32c5b351ff805 100644 |
| --- a/cc/tiled_layer.cc |
| +++ b/cc/tiled_layer.cc |
| @@ -276,12 +276,13 @@ void TiledLayer::setNeedsDisplayRect(const gfx::RectF& 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) |
| + DCHECK(!useLCDText); |
|
danakj
2012/11/07 18:15:00
This won't work well with making it a LayerTreeSet
alokp
2012/11/08 22:34:07
I realized that if-else block is not needed anymor
|
| // Always want border texels and GL_LINEAR due to pinch zoom. |
| borderTexelOption = LayerTilingData::HasBorderTexels; |
| #else |