Index: cc/scheduler/scheduler.h |
diff --git a/cc/scheduler/scheduler.h b/cc/scheduler/scheduler.h |
index c64dad0f23e24a74fa5f4fd902efa09fa576bf29..6c6ccca054b2e1730bf51260df15b2e4b9cf2454 100644 |
--- a/cc/scheduler/scheduler.h |
+++ b/cc/scheduler/scheduler.h |
@@ -41,7 +41,7 @@ class SchedulerClient { |
ScheduledActionDrawAndSwapForced() = 0; |
virtual void ScheduledActionCommit() = 0; |
virtual void ScheduledActionUpdateVisibleTiles() = 0; |
- virtual void ScheduledActionActivatePendingTreeIfNeeded() = 0; |
+ virtual void ScheduledActionActivatePendingTree() = 0; |
virtual void ScheduledActionBeginOutputSurfaceCreation() = 0; |
virtual void ScheduledActionAcquireLayerTexturesForMainThread() = 0; |
virtual void DidAnticipatedDrawTimeChange(base::TimeTicks time) = 0; |
@@ -67,7 +67,8 @@ class CC_EXPORT Scheduler { |
void SetVisible(bool visible); |
void SetCanDraw(bool can_draw); |
- void SetHasPendingTree(bool has_pending_tree); |
+ void NotifyReadyToActivate(); |
+ void SetHasTrees(bool has_pending_tree, bool active_tree_is_null); |
reveman
2013/08/23 16:16:48
has_active_tree? find it confusing that active tre
enne (OOO)
2013/08/23 17:54:09
Doesn't the scheduler already know this informatio
brianderson
2013/08/23 18:17:38
Hmm. I used active_tree_is_null because, technical
brianderson
2013/08/23 18:17:38
Is it safe to assume that the active tree's root l
enne (OOO)
2013/08/23 18:30:35
Ok, good point. I don't think we do, but I think
|
void SetNeedsCommit(); |