| Index: cc/trees/single_thread_proxy.cc
|
| diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
|
| index 488bba48a445c84c966349def4a8340cfa25ac8d..1823574da3fc33dda47128093f3d90f838b5ae39 100644
|
| --- a/cc/trees/single_thread_proxy.cc
|
| +++ b/cc/trees/single_thread_proxy.cc
|
| @@ -25,19 +25,22 @@ scoped_ptr<Proxy> SingleThreadProxy::Create(
|
| LayerTreeHost* layer_tree_host,
|
| LayerTreeHostSingleThreadClient* client,
|
| scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
|
| - scoped_ptr<BeginFrameSource> external_begin_frame_source) {
|
| + scoped_ptr<BeginFrameSource> external_begin_frame_source,
|
| + ProxyBeginFrameSource* proxy_begin_frame_source) {
|
| return make_scoped_ptr(new SingleThreadProxy(
|
| layer_tree_host,
|
| client,
|
| main_task_runner,
|
| - external_begin_frame_source.Pass()));
|
| + external_begin_frame_source.Pass(),
|
| + proxy_begin_frame_source));
|
| }
|
|
|
| SingleThreadProxy::SingleThreadProxy(
|
| LayerTreeHost* layer_tree_host,
|
| LayerTreeHostSingleThreadClient* client,
|
| scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
|
| - scoped_ptr<BeginFrameSource> external_begin_frame_source)
|
| + scoped_ptr<BeginFrameSource> external_begin_frame_source,
|
| + ProxyBeginFrameSource* proxy_begin_frame_source)
|
| : Proxy(main_task_runner, NULL),
|
| layer_tree_host_(layer_tree_host),
|
| client_(client),
|
| @@ -50,6 +53,7 @@ SingleThreadProxy::SingleThreadProxy(
|
| inside_synchronous_composite_(false),
|
| output_surface_creation_requested_(false),
|
| external_begin_frame_source_(external_begin_frame_source.Pass()),
|
| + proxy_begin_frame_source_(proxy_begin_frame_source),
|
| weak_factory_(this) {
|
| TRACE_EVENT0("cc", "SingleThreadProxy::SingleThreadProxy");
|
| DCHECK(Proxy::IsMainThread());
|
| @@ -98,7 +102,8 @@ void SingleThreadProxy::SetLayerTreeHostClientReady() {
|
| layer_tree_host_->id(),
|
| MainThreadTaskRunner(),
|
| base::PowerMonitor::Get(),
|
| - external_begin_frame_source_.Pass());
|
| + external_begin_frame_source_.Pass(),
|
| + proxy_begin_frame_source_);
|
| scheduler_on_impl_thread_->SetCanStart();
|
| scheduler_on_impl_thread_->SetVisible(layer_tree_host_impl_->visible());
|
| }
|
| @@ -649,12 +654,6 @@ bool SingleThreadProxy::MainFrameWillHappenForTesting() {
|
| return false;
|
| }
|
|
|
| -void SingleThreadProxy::SetChildrenNeedBeginFrames(
|
| - bool children_need_begin_frames) {
|
| - scheduler_on_impl_thread_->SetChildrenNeedBeginFrames(
|
| - children_need_begin_frames);
|
| -}
|
| -
|
| void SingleThreadProxy::WillBeginImplFrame(const BeginFrameArgs& args) {
|
| layer_tree_host_impl_->WillBeginImplFrame(args);
|
| }
|
| @@ -816,8 +815,4 @@ void SingleThreadProxy::DidBeginImplFrameDeadline() {
|
| layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame();
|
| }
|
|
|
| -void SingleThreadProxy::SendBeginFramesToChildren(const BeginFrameArgs& args) {
|
| - layer_tree_host_->SendBeginFramesToChildren(args);
|
| -}
|
| -
|
| } // namespace cc
|
|
|