cc: For LCD text, consider unready tiles as having text

R=reveman@chromium.org
BUG=249061

Review URL: https://chromiumcodereview.appspot.com/16821006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207033 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 6 insertions, 6 deletions

diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc
index a93e6566..0dc42fa 100644
--- a/cc/resources/picture_layer_tiling.cc
+++ b/cc/resources/picture_layer_tiling.cc
@@ -16,10 +16,10 @@
 
 namespace cc {
 
-bool PictureLayerTilingClient::TileHasText(Tile* tile) {
+bool PictureLayerTilingClient::TileMayHaveLCDText(Tile* tile) {
   RasterMode raster_mode = HIGH_QUALITY_RASTER_MODE;
   if (!tile->IsReadyToDraw(&raster_mode))
-    return false;
+    return true;
   return tile->has_text(raster_mode);
 }
 
@@ -117,7 +117,7 @@ Region PictureLayerTiling::OpaqueRegionInContentRect(
 void PictureLayerTiling::DestroyAndRecreateTilesWithText() {
   std::vector<TileMapKey> new_tiles;
   for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it) {
-    if (client_->TileHasText(it->second.get()))
+    if (client_->TileMayHaveLCDText(it->second.get()))
       new_tiles.push_back(it->first);
   }
 
diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h
index 390b849..6818868 100644
--- a/cc/resources/picture_layer_tiling.h
+++ b/cc/resources/picture_layer_tiling.h
@@ -38,7 +38,7 @@ class CC_EXPORT PictureLayerTilingClient {
       const PictureLayerTiling* tiling) = 0;
 
   // This is on the client so tests can override behaviour.
-  virtual bool TileHasText(Tile* tile);
+  virtual bool TileMayHaveLCDText(Tile* tile);
 
  protected:
   virtual ~PictureLayerTilingClient() {}
diff --git a/cc/test/fake_picture_layer_tiling_client.cc b/cc/test/fake_picture_layer_tiling_client.cc
index 053559d..652b712 100644
--- a/cc/test/fake_picture_layer_tiling_client.cc
+++ b/cc/test/fake_picture_layer_tiling_client.cc
@@ -66,7 +66,7 @@ const PictureLayerTiling* FakePictureLayerTilingClient::GetTwinTiling(
   return twin_tiling_;
 }
 
-bool FakePictureLayerTilingClient::TileHasText(Tile* tile) {
+bool FakePictureLayerTilingClient::TileMayHaveLCDText(Tile* tile) {
   if (text_rect_.IsEmpty())
     return false;
   return tile->content_rect().Intersects(text_rect_);
diff --git a/cc/test/fake_picture_layer_tiling_client.h b/cc/test/fake_picture_layer_tiling_client.h
index fee6467..3593661 100644
--- a/cc/test/fake_picture_layer_tiling_client.h
+++ b/cc/test/fake_picture_layer_tiling_client.h
@@ -33,7 +33,7 @@ class FakePictureLayerTilingClient : public PictureLayerTilingClient {
   virtual const Region* GetInvalidation() OVERRIDE;
   virtual const PictureLayerTiling* GetTwinTiling(
       const PictureLayerTiling* tiling) OVERRIDE;
-  virtual bool TileHasText(Tile* tile) OVERRIDE;
+  virtual bool TileMayHaveLCDText(Tile* tile) OVERRIDE;
 
   void set_twin_tiling(PictureLayerTiling* tiling) { twin_tiling_ = tiling; }
   void set_text_rect(gfx::Rect rect) { text_rect_ = rect; }