cc: Added tile bundles

cc/test/fake_picture_layer_tiling_client.h

Index: cc/test/fake_picture_layer_tiling_client.h
diff --git a/cc/test/fake_picture_layer_tiling_client.h b/cc/test/fake_picture_layer_tiling_client.h
index 1ad9c246a595be2c25f7563eb7880dd3ca9c95c9..c874e2dec98ae7db381e6c3cb132cd0d664189de 100644
--- a/cc/test/fake_picture_layer_tiling_client.h
+++ b/cc/test/fake_picture_layer_tiling_client.h
@@ -23,6 +23,10 @@ class FakePictureLayerTilingClient : public PictureLayerTilingClient {
   // PictureLayerTilingClient implementation.
   virtual scoped_refptr<Tile> CreateTile(
       PictureLayerTiling* tiling, gfx::Rect rect) OVERRIDE;
+  virtual scoped_refptr<TileBundle> CreateTileBundle(int width,
+                                                     int height,
+                                                     int offset_x,
+                                                     int offset_y) OVERRIDE;
   virtual void UpdatePile(Tile* tile) OVERRIDE {}
   virtual gfx::Size CalculateTileSize(
       gfx::Size content_bounds) const OVERRIDE;
@@ -35,6 +39,21 @@ class FakePictureLayerTilingClient : public PictureLayerTilingClient {
   virtual const Region* GetInvalidation() OVERRIDE;
   virtual const PictureLayerTiling* GetTwinTiling(
       const PictureLayerTiling* tiling) OVERRIDE;
+  virtual bool IsActive() const OVERRIDE {
+    return is_active_;
+  }
+  void MarkActive() {
+    is_active_ = true;
+    is_pending_ = false;
+  }
+
+  virtual bool IsPending() const OVERRIDE {
+    return is_pending_;
+  }
+  void MarkPending() {
+    is_active_ = false;
+    is_pending_ = true;
+  }
 
   void set_twin_tiling(PictureLayerTiling* tiling) { twin_tiling_ = tiling; }
   void set_text_rect(gfx::Rect rect) { text_rect_ = rect; }
@@ -42,18 +61,25 @@ class FakePictureLayerTilingClient : public PictureLayerTilingClient {
   void set_invalidation(const Region& region) { invalidation_ = region; }
 
   TileManager* tile_manager() const {
-    return tile_manager_.get();
+    return set_tile_manager_ ? set_tile_manager_ : tile_manager_.get();
+  }
+
+  void set_tile_manager(TileManager* tile_manager) {
+    set_tile_manager_ = tile_manager;
   }
 
  protected:
   FakeTileManagerClient tile_manager_client_;
   scoped_ptr<TileManager> tile_manager_;
+  TileManager* set_tile_manager_;

[enne (OOO), 2013/11/25 22:17:11]

This is a little bit sketchy.  Maybe it's wrong for the tile manager to live in
the FakePictureLayerTilingClient and we need something like a
FakePictureLayerTilingClientClient (haha) or to just have every
FakePictureLayerTilingClient take in a tile manager in its ctor with lifetime
guarantees provided by the caller.

[vmpstr, 2013/11/27 00:03:15]

Fair enough. I think I'll make tile manager be a constructor argument, since we
do need the same tile manager for multiple tiling clients (if they are to get
the same bundles and whatnot).

   scoped_refptr<PicturePileImpl> pile_;
   gfx::Size tile_size_;
   PictureLayerTiling* twin_tiling_;
   gfx::Rect text_rect_;
   bool allow_create_tile_;
   Region invalidation_;
+  bool is_active_;
+  bool is_pending_;
 };
 
 }  // namespace cc