From ed22978e0be8e4fe2b94315970e1bcef3359b159 Mon Sep 17 00:00:00 2001
From: "alokp@chromium.org"
 <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 15 Nov 2012 05:37:44 +0000
Subject: 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
---
 cc/layer.h        |  2 +-
 cc/tiled_layer.cc | 14 --------------
 cc/tiled_layer.h  |  2 --
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/cc/layer.h b/cc/layer.h
index caa46c1..97bd200 100644
--- a/cc/layer.h
+++ b/cc/layer.h
@@ -173,7 +173,7 @@ public:
     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..391ce68 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -272,20 +272,6 @@ void TiledLayer::setNeedsDisplayRect(const gfx::RectF& dirtyRect)
     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 @@ public:
 
     virtual void setNeedsDisplayRect(const gfx::RectF&) OVERRIDE;
 
-    virtual void setUseLCDText(bool) OVERRIDE;
-
     virtual void setLayerTreeHost(LayerTreeHost*) OVERRIDE;
 
     virtual void setTexturePriorities(const PriorityCalculator&) OVERRIDE;
-- 
cgit v1.1