diff options
Diffstat (limited to 'cc/test')
| -rw-r--r-- | cc/test/fake_picture_layer_tiling_client.cc | 9 | ||||
| -rw-r--r-- | cc/test/fake_picture_layer_tiling_client.h | 2 | ||||
| -rw-r--r-- | cc/test/fake_tile_manager.cc | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/cc/test/fake_picture_layer_tiling_client.cc b/cc/test/fake_picture_layer_tiling_client.cc index 39f1190..053559d 100644 --- a/cc/test/fake_picture_layer_tiling_client.cc +++ b/cc/test/fake_picture_layer_tiling_client.cc @@ -6,6 +6,8 @@ #include <limits> +#include "cc/test/fake_tile_manager.h" + namespace cc { class FakeInfinitePicturePileImpl : public PicturePileImpl { @@ -23,12 +25,7 @@ class FakeInfinitePicturePileImpl : public PicturePileImpl { }; FakePictureLayerTilingClient::FakePictureLayerTilingClient() - : tile_manager_(TileManager::Create(&tile_manager_client_, - NULL, - 1, - false, - &stats_instrumentation_, - false)), + : tile_manager_(new FakeTileManager(&tile_manager_client_)), pile_(new FakeInfinitePicturePileImpl()), twin_tiling_(NULL), allow_create_tile_(true) {} diff --git a/cc/test/fake_picture_layer_tiling_client.h b/cc/test/fake_picture_layer_tiling_client.h index 9b2aa52..fee6467 100644 --- a/cc/test/fake_picture_layer_tiling_client.h +++ b/cc/test/fake_picture_layer_tiling_client.h @@ -9,7 +9,6 @@ #include "cc/resources/picture_pile_impl.h" #include "cc/resources/tile.h" #include "cc/resources/tile_manager.h" -#include "cc/test/fake_rendering_stats_instrumentation.h" #include "cc/test/fake_tile_manager_client.h" #include "ui/gfx/rect.h" @@ -43,7 +42,6 @@ class FakePictureLayerTilingClient : public PictureLayerTilingClient { protected: FakeTileManagerClient tile_manager_client_; - FakeRenderingStatsInstrumentation stats_instrumentation_; scoped_ptr<TileManager> tile_manager_; scoped_refptr<PicturePileImpl> pile_; gfx::Size tile_size_; diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc index e87b159..3410799 100644 --- a/cc/test/fake_tile_manager.cc +++ b/cc/test/fake_tile_manager.cc @@ -25,7 +25,8 @@ FakeTileManager::FakeTileManager(TileManagerClient* client) make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool), 1, false, - NULL) {} + NULL, + GL_RGBA) {} FakeTileManager::FakeTileManager(TileManagerClient* client, ResourceProvider* resource_provider) @@ -34,5 +35,6 @@ FakeTileManager::FakeTileManager(TileManagerClient* client, make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool), 1, false, - NULL) {} + NULL, + resource_provider->best_texture_format()) {} } |