| Index: cc/resources/tile_manager.h
|
| diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
|
| index 087778a49fffb0359dfd0fddf9e6d812c8126543..c4cf12344638502b4486335469eafb5623c8fe01 100644
|
| --- a/cc/resources/tile_manager.h
|
| +++ b/cc/resources/tile_manager.h
|
| @@ -200,16 +200,17 @@ class CC_EXPORT TileManager : public TileTaskRunnerClient,
|
| void DidFinishRunningTileTasks(TaskSet task_set) override;
|
| TaskSetCollection TasksThatShouldBeForcedToComplete() const override;
|
|
|
| - typedef std::vector<Tile*> TileVector;
|
| + typedef std::vector<PrioritizedTile> PrioritizedTileVector;
|
| typedef std::set<Tile*> TileSet;
|
|
|
| // Virtual for test
|
| virtual void ScheduleTasks(
|
| - const TileVector& tiles_that_need_to_be_rasterized);
|
| + const PrioritizedTileVector& tiles_that_need_to_be_rasterized);
|
|
|
| - void AssignGpuMemoryToTiles(RasterTilePriorityQueue* raster_priority_queue,
|
| - size_t scheduled_raser_task_limit,
|
| - TileVector* tiles_that_need_to_be_rasterized);
|
| + void AssignGpuMemoryToTiles(
|
| + RasterTilePriorityQueue* raster_priority_queue,
|
| + size_t scheduled_raser_task_limit,
|
| + PrioritizedTileVector* tiles_that_need_to_be_rasterized);
|
|
|
| private:
|
| class MemoryUsage {
|
| @@ -247,7 +248,8 @@ class CC_EXPORT TileManager : public TileTaskRunnerClient,
|
| void FreeResourcesForTileAndNotifyClientIfTileWasReadyToDraw(Tile* tile);
|
| scoped_refptr<ImageDecodeTask> CreateImageDecodeTask(Tile* tile,
|
| SkPixelRef* pixel_ref);
|
| - scoped_refptr<RasterTask> CreateRasterTask(Tile* tile);
|
| + scoped_refptr<RasterTask> CreateRasterTask(
|
| + const PrioritizedTile& prioritized_tile);
|
|
|
| scoped_ptr<EvictionTilePriorityQueue>
|
| FreeTileResourcesUntilUsageIsWithinLimit(
|
|
|