| Index: cc/resources/tile_manager.h
|
| diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
|
| index 5ad80910f8e8aed434edc19e2a04571ce3d62781..7c5352f90d84e6f94a114977ed3dd749ef459218 100644
|
| --- a/cc/resources/tile_manager.h
|
| +++ b/cc/resources/tile_manager.h
|
| @@ -227,7 +227,10 @@ class CC_EXPORT TileManager : public RasterizerClient,
|
|
|
| void SetRasterizerForTesting(Rasterizer* rasterizer);
|
|
|
| - void CleanUpReleasedTilesForTesting() { CleanUpReleasedTiles(); }
|
| + void FreeResourcesAndCleanUpReleasedTilesForTesting() {
|
| + FreeResourcesForReleasedTiles();
|
| + CleanUpReleasedTiles();
|
| + }
|
|
|
| protected:
|
| TileManager(TileManagerClient* client,
|
| @@ -240,6 +243,7 @@ class CC_EXPORT TileManager : public RasterizerClient,
|
| friend class Tile;
|
| void DidChangeTilePriority(Tile* tile);
|
|
|
| + void FreeResourcesForReleasedTiles();
|
| void CleanUpReleasedTiles();
|
|
|
| // Overriden from RefCountedManager<Tile>:
|
| @@ -288,6 +292,8 @@ class CC_EXPORT TileManager : public RasterizerClient,
|
| bool IsReadyToActivate() const;
|
| void CheckIfReadyToActivate();
|
|
|
| + static bool TileHasRasterTask(const Tile* tile);
|
| +
|
| TileManagerClient* client_;
|
| scoped_refptr<base::SequencedTaskRunner> task_runner_;
|
| ResourcePool* resource_pool_;
|
| @@ -331,8 +337,6 @@ class CC_EXPORT TileManager : public RasterizerClient,
|
| // Queue used when scheduling raster tasks.
|
| RasterTaskQueue raster_queue_;
|
|
|
| - std::vector<scoped_refptr<RasterTask> > orphan_raster_tasks_;
|
| -
|
| UniqueNotifier ready_to_activate_check_notifier_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TileManager);
|
|
|