Chromium Code Reviews| Index: cc/trees/proxy.h |
| diff --git a/cc/trees/proxy.h b/cc/trees/proxy.h |
| index 112c259dc47c04bb6eb3f45f9c517390f885c741..126a311a795f239593c515c359cd8eb27b3bbd5e 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/blocking_task_runner.h" |
| namespace base { |
| namespace debug { |
| @@ -103,6 +104,10 @@ class CC_EXPORT Proxy { |
| // Testing hooks |
| virtual bool MainFrameWillHappenForTesting() = 0; |
| + scoped_refptr<BlockingTaskRunner> blocking_main_thread_task_runner() const { |
|
danakj
2014/08/28 17:10:46
could this return a raw pointer?
Sami
2014/08/28 18:21:17
Yep, done.
|
| + return blocking_main_thread_task_runner_; |
| + } |
| + |
| protected: |
| Proxy(scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |
| scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner); |
| @@ -113,6 +118,8 @@ class CC_EXPORT Proxy { |
| private: |
| scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_; |
| scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner_; |
| + scoped_refptr<BlockingTaskRunner> blocking_main_thread_task_runner_; |
| + |
| #if DCHECK_IS_ON |
| const base::PlatformThreadId main_thread_id_; |
| bool impl_thread_is_overridden_; |