Index: cc/trees/single_thread_proxy.h |
diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h |
index 17aec8ee45c65dc8f4b707c9d34eaa4843ed5127..d0bf6fd1463a1c1152cdacee5d5bba038dd616d8 100644 |
--- a/cc/trees/single_thread_proxy.h |
+++ b/cc/trees/single_thread_proxy.h |
@@ -11,6 +11,7 @@ |
#include "cc/animation/animation_events.h" |
#include "cc/output/begin_frame_args.h" |
#include "cc/scheduler/scheduler.h" |
+#include "cc/trees/blocking_task_runner.h" |
#include "cc/trees/layer_tree_host_impl.h" |
#include "cc/trees/proxy.h" |
#include "cc/trees/proxy_timing_history.h" |
@@ -102,7 +103,7 @@ class CC_EXPORT SingleThreadProxy : public Proxy, |
virtual void PostDelayedScrollbarFadeOnImplThread( |
const base::Closure& start_fade, |
base::TimeDelta delay) OVERRIDE {} |
- virtual void DidActivateSyncTree() OVERRIDE {} |
+ virtual void DidActivateSyncTree() OVERRIDE; |
virtual void DidManageTiles() OVERRIDE; |
virtual void SetDebugState(const LayerTreeDebugState& debug_state) OVERRIDE {} |
@@ -119,11 +120,13 @@ class CC_EXPORT SingleThreadProxy : public Proxy, |
void BeginMainFrame(); |
void BeginMainFrameAbortedOnImplThread(); |
- void DoCommit(const BeginFrameArgs& begin_frame_args); |
+ void DoBeginMainFrame(const BeginFrameArgs& begin_frame_args); |
+ void DoCommit(); |
DrawResult DoComposite(base::TimeTicks frame_begin_time, |
LayerTreeHostImpl::FrameData* frame); |
void DoSwap(); |
void DidCommitAndDrawFrame(); |
+ void CommitComplete(); |
bool ShouldComposite() const; |
void UpdateBackgroundAnimateTicking(); |
@@ -141,6 +144,8 @@ class CC_EXPORT SingleThreadProxy : public Proxy, |
scoped_ptr<Scheduler> scheduler_on_impl_thread_; |
ProxyTimingHistory timing_history_; |
+ scoped_ptr<BlockingTaskRunner::CapturePostTasks> commit_blocking_task_runner_; |
+ scoped_ptr<ResourceUpdateQueue> queue_for_commit_; |
bool next_frame_is_newly_committed_frame_; |
bool inside_draw_; |