| Index: cc/trees/proxy.h
|
| diff --git a/cc/trees/proxy.h b/cc/trees/proxy.h
|
| index 838e44f855c2e109c3bf71676312ae8f086d156b..5fc29bcec1ed6f700225742009a2b1157323e04c 100644
|
| --- a/cc/trees/proxy.h
|
| +++ b/cc/trees/proxy.h
|
| @@ -15,6 +15,7 @@
|
| #include "base/time/time.h"
|
| #include "base/values.h"
|
| #include "cc/base/cc_export.h"
|
| +#include "cc/trees/main_thread_task_runner.h"
|
|
|
| namespace base { class SingleThreadTaskRunner; }
|
|
|
| @@ -26,6 +27,7 @@ class Vector2d;
|
| namespace cc {
|
|
|
| class LayerTreeDebugState;
|
| +class MainThreadTaskRunner;
|
| class OutputSurface;
|
| struct RendererCapabilities;
|
|
|
| @@ -33,7 +35,7 @@ struct RendererCapabilities;
|
| // the compositor over to the compositor implementation.
|
| class CC_EXPORT Proxy {
|
| public:
|
| - base::SingleThreadTaskRunner* MainThreadTaskRunner() const;
|
| + MainThreadTaskRunner* MainThreadTaskRunner() const;
|
| bool HasImplThread() const;
|
| base::SingleThreadTaskRunner* ImplThreadTaskRunner() const;
|
|
|
| @@ -100,14 +102,14 @@ class CC_EXPORT Proxy {
|
| virtual scoped_ptr<base::Value> SchedulerAsValueForTesting();
|
|
|
| protected:
|
| - explicit Proxy(
|
| - scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
|
| + Proxy(scoped_refptr<cc::MainThreadTaskRunner> main_task_runner,
|
| + scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
|
| friend class DebugScopedSetImplThread;
|
| friend class DebugScopedSetMainThread;
|
| friend class DebugScopedSetMainThreadBlocked;
|
|
|
| private:
|
| - scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
|
| + scoped_refptr<cc::MainThreadTaskRunner> main_task_runner_;
|
| scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner_;
|
| #if DCHECK_IS_ON
|
| const base::PlatformThreadId main_thread_id_;
|
|
|