Always use border texels on layer tiles. We already did that on certain platforms. This patch extends it to all platforms.
BUG=160072
Review URL: https://chromiumcodereview.appspot.com/11360205
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167870 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/cc/layer.h b/cc/layer.h
index caa46c1..97bd2005 100644
--- a/cc/layer.h
+++ b/cc/layer.h
@@ -173,7 +173,7 @@
void setUseParentBackfaceVisibility(bool useParentBackfaceVisibility) { m_useParentBackfaceVisibility = useParentBackfaceVisibility; }
bool useParentBackfaceVisibility() const { return m_useParentBackfaceVisibility; }
- virtual void setUseLCDText(bool);
+ void setUseLCDText(bool);
bool useLCDText() const { return m_useLCDText; }
virtual void setLayerTreeHost(LayerTreeHost*);
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index 77be6eb..391ce68e 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -272,20 +272,6 @@
ContentsScalingLayer::setNeedsDisplayRect(dirtyRect);
}
-void TiledLayer::setUseLCDText(bool useLCDText)
-{
- ContentsScalingLayer::setUseLCDText(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);
-}
-
void TiledLayer::invalidateContentRect(const gfx::Rect& contentRect)
{
updateBounds();
diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h
index 052bb99..11007e1 100644
--- a/cc/tiled_layer.h
+++ b/cc/tiled_layer.h
@@ -25,8 +25,6 @@
virtual void setNeedsDisplayRect(const gfx::RectF&) OVERRIDE;
- virtual void setUseLCDText(bool) OVERRIDE;
-
virtual void setLayerTreeHost(LayerTreeHost*) OVERRIDE;
virtual void setTexturePriorities(const PriorityCalculator&) OVERRIDE;
