Index: cc/trees/thread_proxy.h |
diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h |
index 817b36ddae47528caa4a85105e17bcea215a4d9f..a8eda8be7f88f3b5047e1715e8289cf9883b8e41 100644 |
--- a/cc/trees/thread_proxy.h |
+++ b/cc/trees/thread_proxy.h |
@@ -25,6 +25,7 @@ class SingleThreadTaskRunner; |
namespace cc { |
+class BeginFrameSource; |
class ContextProvider; |
class InputHandlerClient; |
class LayerTreeHost; |
@@ -40,7 +41,8 @@ class CC_EXPORT ThreadProxy : public Proxy, |
static scoped_ptr<Proxy> Create( |
LayerTreeHost* layer_tree_host, |
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |
- scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner); |
+ scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner, |
+ scoped_ptr<BeginFrameSource> external_begin_frame_source); |
virtual ~ThreadProxy(); |
@@ -210,7 +212,6 @@ class CC_EXPORT ThreadProxy : public Proxy, |
virtual void DidManageTiles() override; |
// SchedulerClient implementation |
- virtual BeginFrameSource* ExternalBeginFrameSource() override; |
virtual void WillBeginImplFrame(const BeginFrameArgs& args) override; |
virtual void ScheduledActionSendBeginMainFrame() override; |
virtual DrawResult ScheduledActionDrawAndSwapIfPossible() override; |
@@ -231,9 +232,11 @@ class CC_EXPORT ThreadProxy : public Proxy, |
virtual void ReadyToFinalizeTextureUpdates() override; |
protected: |
- ThreadProxy(LayerTreeHost* layer_tree_host, |
- scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |
- scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner); |
+ ThreadProxy( |
+ LayerTreeHost* layer_tree_host, |
+ scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |
+ scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner, |
+ scoped_ptr<BeginFrameSource> external_begin_frame_source); |
private: |
// Called on main thread. |
@@ -298,6 +301,8 @@ class CC_EXPORT ThreadProxy : public Proxy, |
base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; |
base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; |
+ scoped_ptr<BeginFrameSource> external_begin_frame_source_; |
brianderson
2014/10/18 00:08:45
Should this go into the CompositorThreadOnly group
simonhong
2014/10/23 01:03:08
Done.
|
+ |
DISALLOW_COPY_AND_ASSIGN(ThreadProxy); |
}; |