| Index: cc/trees/layer_tree_host.cc
|
| diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
|
| index 30b427515ab14a23ccd7db62d53c149308d7a109..e5f2f0443daa3a22db35c47d35bad801bef19c2b 100644
|
| --- a/cc/trees/layer_tree_host.cc
|
| +++ b/cc/trees/layer_tree_host.cc
|
| @@ -92,12 +92,14 @@ scoped_ptr<LayerTreeHost> LayerTreeHost::CreateSingleThreaded(
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| const LayerTreeSettings& settings,
|
| 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) {
|
| scoped_ptr<LayerTreeHost> layer_tree_host(new LayerTreeHost(
|
| client, shared_bitmap_manager, gpu_memory_buffer_manager, settings));
|
| layer_tree_host->InitializeSingleThreaded(single_thread_client,
|
| main_task_runner,
|
| - external_begin_frame_source.Pass());
|
| + external_begin_frame_source.Pass(),
|
| + proxy_begin_frame_source);
|
| return layer_tree_host.Pass();
|
| }
|
|
|
| @@ -158,12 +160,14 @@ void LayerTreeHost::InitializeThreaded(
|
| void LayerTreeHost::InitializeSingleThreaded(
|
| LayerTreeHostSingleThreadClient* single_thread_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) {
|
| InitializeProxy(
|
| SingleThreadProxy::Create(this,
|
| single_thread_client,
|
| main_task_runner,
|
| - external_begin_frame_source.Pass()));
|
| + external_begin_frame_source.Pass(),
|
| + proxy_begin_frame_source));
|
| }
|
|
|
| void LayerTreeHost::InitializeForTesting(scoped_ptr<Proxy> proxy_for_testing) {
|
| @@ -1368,14 +1372,4 @@ SurfaceSequence LayerTreeHost::CreateSurfaceSequence() {
|
| return SurfaceSequence(surface_id_namespace_, next_surface_sequence_++);
|
| }
|
|
|
| -void LayerTreeHost::SetChildrenNeedBeginFrames(
|
| - bool children_need_begin_frames) const {
|
| - proxy_->SetChildrenNeedBeginFrames(children_need_begin_frames);
|
| -}
|
| -
|
| -void LayerTreeHost::SendBeginFramesToChildren(
|
| - const BeginFrameArgs& args) const {
|
| - client_->SendBeginFramesToChildren(args);
|
| -}
|
| -
|
| } // namespace cc
|
|
|