Index: cc/trees/thread_proxy.h |
diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h |
index 544ef87d6591d2e7e5951be1499df15831aa9603..ffa88ad1bb8cd09f963708f6b7d43aa9a185b437 100644 |
--- a/cc/trees/thread_proxy.h |
+++ b/cc/trees/thread_proxy.h |
@@ -71,6 +71,7 @@ class ThreadProxy : public Proxy, |
virtual void DidLoseOutputSurfaceOnImplThread() OVERRIDE; |
virtual void OnSwapBuffersCompleteOnImplThread() OVERRIDE; |
virtual void BeginFrameOnImplThread(const BeginFrameArgs& args) OVERRIDE; |
+ virtual void DidBeginFrameDeadlineOnImplThread() OVERRIDE; |
virtual void OnCanDrawStateChanged(bool can_draw) OVERRIDE; |
virtual void OnHasPendingTreeStateChanged(bool has_pending_tree) OVERRIDE; |
virtual void SetNeedsRedrawOnImplThread() OVERRIDE; |
@@ -105,6 +106,8 @@ class ThreadProxy : public Proxy, |
virtual void ScheduledActionAcquireLayerTexturesForMainThread() OVERRIDE; |
virtual void DidAnticipatedDrawTimeChange(base::TimeTicks time) OVERRIDE; |
virtual base::TimeDelta DrawDurationEstimate() OVERRIDE; |
+ virtual void PostBeginFrameDeadline(const base::Closure& closure, |
+ base::TimeTicks deadline) OVERRIDE; |
// ResourceUpdateControllerClient implementation |
virtual void ReadyToFinalizeTextureUpdates() OVERRIDE; |
@@ -211,12 +214,16 @@ class ThreadProxy : public Proxy, |
scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_; |
scoped_ptr<Scheduler> scheduler_on_impl_thread_; |
+ bool frame_did_draw_; |
// Set when the main thread is waiting on a |
// ScheduledActionSendBeginFrameToMainThread to be issued. |
CompletionEvent* |
begin_frame_sent_to_main_thread_completion_event_on_impl_thread_; |
+ // Set when there is a pending tree on a commit. |
+ base::Closure deferred_start_commit_on_impl_thread_; |
+ |
// Set when the main thread is waiting on a readback. |
ReadbackRequest* readback_request_on_impl_thread_; |