| Index: cc/test/fake_tile_manager.cc
|
| diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc
|
| index 0ca699f8064bbbb8f19dcea2aa3cb9f955ff6fee..02762c8dd8242207d52e8e3e19f83258fea6ddc2 100644
|
| --- a/cc/test/fake_tile_manager.cc
|
| +++ b/cc/test/fake_tile_manager.cc
|
| @@ -52,7 +52,8 @@ FakeTileManager::FakeTileManager(TileManagerClient* client)
|
| make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
|
| 1,
|
| std::numeric_limits<unsigned>::max(),
|
| - NULL) {}
|
| + NULL),
|
| + in_bundle_cleanup_(false) {}
|
|
|
| FakeTileManager::FakeTileManager(TileManagerClient* client,
|
| ResourceProvider* resource_provider)
|
| @@ -61,7 +62,8 @@ FakeTileManager::FakeTileManager(TileManagerClient* client,
|
| make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
|
| 1,
|
| std::numeric_limits<unsigned>::max(),
|
| - NULL) {}
|
| + NULL),
|
| + in_bundle_cleanup_(false) {}
|
|
|
| FakeTileManager::FakeTileManager(TileManagerClient* client,
|
| ResourceProvider* resource_provider,
|
| @@ -71,7 +73,8 @@ FakeTileManager::FakeTileManager(TileManagerClient* client,
|
| make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
|
| 1,
|
| raster_task_limit_bytes,
|
| - NULL) {}
|
| + NULL),
|
| + in_bundle_cleanup_(false) {}
|
|
|
| FakeTileManager::~FakeTileManager() {}
|
|
|
| @@ -97,7 +100,15 @@ void FakeTileManager::CheckForCompletedTasks() {
|
|
|
| void FakeTileManager::Release(Tile* tile) {
|
| TileManager::Release(tile);
|
| + if (!in_bundle_cleanup_)
|
| + CleanUpReleasedTiles();
|
| +}
|
| +
|
| +void FakeTileManager::Release(TileBundle* bundle) {
|
| + TileManager::Release(bundle);
|
| + in_bundle_cleanup_ = true;
|
| CleanUpReleasedTiles();
|
| + in_bundle_cleanup_ = false;
|
| }
|
|
|
| } // namespace cc
|
|
|