| Index: cc/trees/layer_tree_host.h
|
| diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
|
| index 68bc1ebeb3470a5ba864fac5ff9a52da59df6cbf..f9bc9723260ee9b06cc22656eea3543e020ed9c2 100644
|
| --- a/cc/trees/layer_tree_host.h
|
| +++ b/cc/trees/layer_tree_host.h
|
| @@ -55,6 +55,7 @@ class LayerTreeHostImplClient;
|
| class LayerTreeHostSingleThreadClient;
|
| class PrioritizedResource;
|
| class PrioritizedResourceManager;
|
| +class ProxyBeginFrameSource;
|
| class Region;
|
| class RenderingStatsInstrumentation;
|
| class ResourceProvider;
|
| @@ -104,7 +105,8 @@ class CC_EXPORT LayerTreeHost {
|
| 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);
|
| virtual ~LayerTreeHost();
|
|
|
| void SetLayerTreeHostClientReady();
|
| @@ -325,9 +327,6 @@ class CC_EXPORT LayerTreeHost {
|
| void set_surface_id_namespace(uint32_t id_namespace);
|
| SurfaceSequence CreateSurfaceSequence();
|
|
|
| - void SetChildrenNeedBeginFrames(bool children_need_begin_frames) const;
|
| - void SendBeginFramesToChildren(const BeginFrameArgs& args) const;
|
| -
|
| protected:
|
| LayerTreeHost(LayerTreeHostClient* client,
|
| SharedBitmapManager* shared_bitmap_manager,
|
| @@ -340,7 +339,8 @@ class CC_EXPORT LayerTreeHost {
|
| void 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);
|
| void InitializeForTesting(scoped_ptr<Proxy> proxy_for_testing);
|
| void SetOutputSurfaceLostForTesting(bool is_lost) {
|
| output_surface_lost_ = is_lost;
|
|
|