| Index: cc/trees/single_thread_proxy.h
|
| diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h
|
| index a6c348acc6cd6939a7f5d38704f7c9a32ffac8be..92031021a84de53a8d485fb7cb9e91b390bd0bbe 100644
|
| --- a/cc/trees/single_thread_proxy.h
|
| +++ b/cc/trees/single_thread_proxy.h
|
| @@ -23,6 +23,7 @@ class BeginFrameSource;
|
| class ContextProvider;
|
| class LayerTreeHost;
|
| class LayerTreeHostSingleThreadClient;
|
| +class ProxyBeginFrameSource;
|
|
|
| class CC_EXPORT SingleThreadProxy : public Proxy,
|
| NON_EXPORTED_BASE(LayerTreeHostImplClient),
|
| @@ -32,7 +33,8 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
|
| 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);
|
| ~SingleThreadProxy() override;
|
|
|
| // Proxy implementation
|
| @@ -60,7 +62,6 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
|
| bool SupportsImplScrolling() const override;
|
| void AsValueInto(base::debug::TracedValue* state) const override;
|
| bool MainFrameWillHappenForTesting() override;
|
| - void SetChildrenNeedBeginFrames(bool children_need_begin_frames) override;
|
|
|
| // SchedulerClient implementation
|
| void WillBeginImplFrame(const BeginFrameArgs& args) override;
|
| @@ -77,7 +78,6 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
|
| base::TimeDelta BeginMainFrameToCommitDurationEstimate() override;
|
| base::TimeDelta CommitToActivateDurationEstimate() override;
|
| void DidBeginImplFrameDeadline() override;
|
| - void SendBeginFramesToChildren(const BeginFrameArgs& args) override;
|
|
|
| // LayerTreeHostImplClient implementation
|
| void UpdateRendererCapabilitiesOnImplThread() override;
|
| @@ -119,7 +119,8 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
|
| 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);
|
|
|
| void BeginMainFrame();
|
| void BeginMainFrameAbortedOnImplThread(CommitEarlyOutReason reason);
|
| @@ -167,6 +168,8 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
|
|
|
| scoped_ptr<BeginFrameSource> external_begin_frame_source_;
|
|
|
| + ProxyBeginFrameSource* proxy_begin_frame_source_;
|
| +
|
| base::WeakPtrFactory<SingleThreadProxy> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SingleThreadProxy);
|
|
|