| Index: cc/trees/single_thread_proxy.h
|
| diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h
|
| index 3ac80cc95072d403e1f19ebb3adc104fbd3912f8..b714e445b9a96a7513096cdef483e2a9ee75b21d 100644
|
| --- a/cc/trees/single_thread_proxy.h
|
| +++ b/cc/trees/single_thread_proxy.h
|
| @@ -129,7 +129,7 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
|
| scoped_ptr<BeginFrameSource> external_begin_frame_source);
|
|
|
| private:
|
| - void BeginMainFrame();
|
| + void BeginMainFrame(const BeginFrameArgs& begin_frame_args);
|
| void BeginMainFrameAbortedOnImplThread(CommitEarlyOutReason reason);
|
| void DoAnimate();
|
| void DoBeginMainFrame(const BeginFrameArgs& begin_frame_args);
|
| @@ -160,6 +160,7 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
|
| scoped_ptr<ResourceUpdateQueue> queue_for_commit_;
|
| bool next_frame_is_newly_committed_frame_;
|
|
|
| + bool inside_impl_frame_;
|
| bool inside_draw_;
|
| bool defer_commits_;
|
| bool commit_requested_;
|
|
|