| Index: cc/tiles/tile_manager.h
|
| diff --git a/cc/tiles/tile_manager.h b/cc/tiles/tile_manager.h
|
| index 6b5745ea638562a74456b1b41282d7d6b21c1132..7ec6a8c9e93828f682515e254250aa659e0fdefb 100644
|
| --- a/cc/tiles/tile_manager.h
|
| +++ b/cc/tiles/tile_manager.h
|
| @@ -248,8 +248,7 @@ class CC_EXPORT TileManager {
|
|
|
| void FreeResourcesForTile(Tile* tile);
|
| void FreeResourcesForTileAndNotifyClientIfTileWasReadyToDraw(Tile* tile);
|
| - scoped_refptr<RasterTask> CreateRasterTask(
|
| - const PrioritizedTile& prioritized_tile);
|
| + scoped_refptr<Task> CreateRasterTask(const PrioritizedTile& prioritized_tile);
|
|
|
| scoped_ptr<EvictionTilePriorityQueue>
|
| FreeTileResourcesUntilUsageIsWithinLimit(
|
| @@ -275,7 +274,7 @@ class CC_EXPORT TileManager {
|
| void DidFinishRunningTileTasksRequiredForDraw();
|
| void DidFinishRunningAllTileTasks();
|
|
|
| - scoped_refptr<TileTask> CreateTaskSetFinishedTask(
|
| + scoped_refptr<Task> CreateTaskSetFinishedTask(
|
| void (TileManager::*callback)());
|
|
|
| scoped_ptr<base::trace_event::ConvertableToTraceFormat>
|
| @@ -305,12 +304,12 @@ class CC_EXPORT TileManager {
|
|
|
| std::vector<Tile*> released_tiles_;
|
|
|
| - std::vector<scoped_refptr<TileTask>> orphan_tasks_;
|
| + std::vector<scoped_refptr<Task>> orphan_tasks_;
|
|
|
| TaskGraph graph_;
|
| - scoped_refptr<TileTask> required_for_activation_done_task_;
|
| - scoped_refptr<TileTask> required_for_draw_done_task_;
|
| - scoped_refptr<TileTask> all_done_task_;
|
| + scoped_refptr<Task> required_for_activation_done_task_;
|
| + scoped_refptr<Task> required_for_draw_done_task_;
|
| + scoped_refptr<Task> all_done_task_;
|
|
|
| UniqueNotifier more_tiles_need_prepare_check_notifier_;
|
|
|
|
|