| Index: cc/thread_proxy.h
|
| diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h
|
| index 1c6c3e3340c0895665ba71d22deb7fa40196f32c..29832fc3ce23a193077f245b8382a1e6beda753b 100644
|
| --- a/cc/thread_proxy.h
|
| +++ b/cc/thread_proxy.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef CC_THREAD_PROXY_H_
|
| #define CC_THREAD_PROXY_H_
|
|
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/time.h"
|
| #include "cc/animation_events.h"
|
| #include "cc/completion_event.h"
|
| @@ -24,7 +25,7 @@ class Thread;
|
|
|
| class ThreadProxy : public Proxy, LayerTreeHostImplClient, SchedulerClient, ResourceUpdateControllerClient {
|
| public:
|
| - static scoped_ptr<Proxy> create(LayerTreeHost*);
|
| + static scoped_ptr<Proxy> create(LayerTreeHost*, scoped_ptr<Thread> implThread);
|
|
|
| virtual ~ThreadProxy();
|
|
|
| @@ -77,7 +78,7 @@ public:
|
| virtual void readyToFinalizeTextureUpdates() OVERRIDE;
|
|
|
| private:
|
| - explicit ThreadProxy(LayerTreeHost*);
|
| + ThreadProxy(LayerTreeHost*, scoped_ptr<Thread> implThread);
|
|
|
| // Set on impl thread, read on main thread.
|
| struct BeginFrameAndCommitState {
|
|
|