Index: cc/scheduler/scheduler.h |
diff --git a/cc/scheduler/scheduler.h b/cc/scheduler/scheduler.h |
index e740eb7c078c6399aa47e2a9b46195f45f1d0ee5..66e26efbc9ee25e16ced800410a39b8b375f5dfc 100644 |
--- a/cc/scheduler/scheduler.h |
+++ b/cc/scheduler/scheduler.h |
@@ -8,6 +8,7 @@ |
#include <string> |
#include "base/basictypes.h" |
+#include "base/cancelable_callback.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/time/time.h" |
#include "cc/base/cc_export.h" |
@@ -46,6 +47,9 @@ class SchedulerClient { |
virtual base::TimeDelta DrawDurationEstimate() = 0; |
virtual base::TimeDelta BeginFrameToCommitDurationEstimate() = 0; |
virtual base::TimeDelta CommitToActivateDurationEstimate() = 0; |
+ virtual void PostBeginFrameDeadline(const base::Closure& closure, |
+ base::TimeTicks deadline) = 0; |
+ virtual void DidBeginFrameDeadlineOnImplThread() = 0; |
protected: |
virtual ~SchedulerClient() {} |
@@ -98,6 +102,7 @@ class CC_EXPORT Scheduler { |
base::TimeTicks LastBeginFrameOnImplThreadTime(); |
void BeginFrame(const BeginFrameArgs& args); |
+ void OnBeginFrameDeadline(); |
void PollForAnticipatedDrawTriggers(); |
scoped_ptr<base::Value> StateAsValue() { |
@@ -108,7 +113,9 @@ class CC_EXPORT Scheduler { |
Scheduler(SchedulerClient* client, |
const SchedulerSettings& scheduler_settings); |
+ void PostBeginFrameDeadline(base::TimeTicks deadline); |
void SetupNextBeginFrameIfNeeded(); |
+ void ActivatePendingTree(); |
void DrawAndSwapIfPossible(); |
void DrawAndSwapForced(); |
void DrawAndReadback(); |
@@ -119,8 +126,9 @@ class CC_EXPORT Scheduler { |
base::WeakPtrFactory<Scheduler> weak_factory_; |
bool last_set_needs_begin_frame_; |
- bool has_pending_begin_frame_; |
+ int begin_frame_did_not_swap_count_; |
BeginFrameArgs last_begin_frame_args_; |
+ base::CancelableClosure begin_frame_deadline_closure_; |
base::CancelableClosure poll_for_draw_triggers_closure_; |
SchedulerStateMachine state_machine_; |