Revert "cc: Added tile bundles"

This reverts commit 24835e9056711da23091ce0116e7ca41d1bdf279.

Revert "cc: Reset tiling size upon destruction."

This reverts commit 86b1819ea0f9e1ff666b89835957ab1ad68ef706.

BUG=329682
R=enne

Review URL: https://codereview.chromium.org/98113005

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

1 files changed, 11 insertions, 14 deletions

diff --git a/cc/test/fake_picture_layer_tiling_client.cc b/cc/test/fake_picture_layer_tiling_client.cc
index c202364..e217336 100644
--- a/cc/test/fake_picture_layer_tiling_client.cc
+++ b/cc/test/fake_picture_layer_tiling_client.cc
@@ -23,14 +23,19 @@ class FakeInfinitePicturePileImpl : public PicturePileImpl {
   virtual ~FakeInfinitePicturePileImpl() {}
 };
 
+FakePictureLayerTilingClient::FakePictureLayerTilingClient()
+    : tile_manager_(new FakeTileManager(&tile_manager_client_)),
+      pile_(new FakeInfinitePicturePileImpl()),
+      twin_tiling_(NULL),
+      allow_create_tile_(true) {}
+
 FakePictureLayerTilingClient::FakePictureLayerTilingClient(
-    TileManager* tile_manager)
-    : tile_manager_(tile_manager),
+    ResourceProvider* resource_provider)
+    : tile_manager_(
+          new FakeTileManager(&tile_manager_client_, resource_provider)),
       pile_(new FakeInfinitePicturePileImpl()),
       twin_tiling_(NULL),
-      allow_create_tile_(true),
-      is_active_(false),
-      is_pending_(false) {}
+      allow_create_tile_(true) {}
 
 FakePictureLayerTilingClient::~FakePictureLayerTilingClient() {
 }
@@ -40,18 +45,10 @@ scoped_refptr<Tile> FakePictureLayerTilingClient::CreateTile(
     gfx::Rect rect) {
   if (!allow_create_tile_)
     return scoped_refptr<Tile>();
-  return tile_manager()->CreateTile(
+  return tile_manager_->CreateTile(
       pile_.get(), tile_size_, rect, gfx::Rect(), 1, 0, 0, Tile::USE_LCD_TEXT);
 }
 
-scoped_refptr<TileBundle> FakePictureLayerTilingClient::CreateTileBundle(
-    int offset_x,
-    int offset_y,
-    int width,
-    int height) {
-  return tile_manager()->CreateTileBundle(offset_x, offset_y, width, height);
-}
-
 void FakePictureLayerTilingClient::SetTileSize(gfx::Size tile_size) {
   tile_size_ = tile_size;
 }