| Index: cc/tiles/tile_manager.h
|
| diff --git a/cc/tiles/tile_manager.h b/cc/tiles/tile_manager.h
|
| index b522423415fd50d29a53ec3c5adb95b15f2a11b6..81af16e6851c378339255e1fcb16724ecd2ab817 100644
|
| --- a/cc/tiles/tile_manager.h
|
| +++ b/cc/tiles/tile_manager.h
|
| @@ -268,22 +268,23 @@ class CC_EXPORT TileManager {
|
| bool TilePriorityViolatesMemoryPolicy(const TilePriority& priority);
|
| bool AreRequiredTilesReadyToDraw(RasterTilePriorityQueue::Type type) const;
|
| void CheckIfMoreTilesNeedToBePrepared();
|
| - void CheckAndIssueSignals();
|
| + void CheckAndNotifyReadyToActivate();
|
| + void CheckAndNotifyReadyToDraw();
|
| + void CheckAndNotifyAllTileTasksCompleted();
|
| bool MarkTilesOutOfMemory(
|
| std::unique_ptr<RasterTilePriorityQueue> queue) const;
|
|
|
| ResourceFormat DetermineResourceFormat(const Tile* tile) const;
|
| bool DetermineResourceRequiresSwizzle(const Tile* tile) const;
|
|
|
| - void DidFinishRunningTileTasksRequiredForActivation();
|
| - void DidFinishRunningTileTasksRequiredForDraw();
|
| - void DidFinishRunningAllTileTasks();
|
| + void DidFinishRunningTileTasksRequiredForActivation(
|
| + uint64_t source_prepare_tiles_id);
|
| + void DidFinishRunningTileTasksRequiredForDraw(
|
| + uint64_t source_prepare_tiles_id);
|
| + void DidFinishRunningAllTileTasks(uint64_t source_prepare_tiles_id);
|
|
|
| scoped_refptr<TileTask> CreateTaskSetFinishedTask(
|
| - void (TileManager::*callback)());
|
| -
|
| - std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
|
| - ScheduledTasksStateAsValue() const;
|
| + void (TileManager::*callback)(uint64_t source_prepare_tiles_id));
|
|
|
| TileManagerClient* client_;
|
| scoped_refptr<base::SequencedTaskRunner> task_runner_;
|
| @@ -316,23 +317,6 @@ class CC_EXPORT TileManager {
|
| scoped_refptr<TileTask> required_for_draw_done_task_;
|
| scoped_refptr<TileTask> all_done_task_;
|
|
|
| - UniqueNotifier more_tiles_need_prepare_check_notifier_;
|
| -
|
| - struct Signals {
|
| - Signals();
|
| -
|
| - void reset();
|
| -
|
| - bool ready_to_activate;
|
| - bool did_notify_ready_to_activate;
|
| - bool ready_to_draw;
|
| - bool did_notify_ready_to_draw;
|
| - bool all_tile_tasks_completed;
|
| - bool did_notify_all_tile_tasks_completed;
|
| - } signals_;
|
| -
|
| - UniqueNotifier signals_check_notifier_;
|
| -
|
| bool has_scheduled_tile_tasks_;
|
|
|
| uint64_t prepare_tiles_count_;
|
|
|