OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/trees/proxy.h" | 5 #include "cc/trees/proxy.h" |
6 | 6 |
7 #include "base/message_loop/message_loop_proxy.h" | 7 #include "base/message_loop/message_loop_proxy.h" |
8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "cc/trees/blocking_task_runner.h" |
9 | 10 |
10 namespace cc { | 11 namespace cc { |
11 | 12 |
12 base::SingleThreadTaskRunner* Proxy::MainThreadTaskRunner() const { | 13 base::SingleThreadTaskRunner* Proxy::MainThreadTaskRunner() const { |
13 return main_task_runner_.get(); | 14 return main_task_runner_.get(); |
14 } | 15 } |
15 | 16 |
16 bool Proxy::HasImplThread() const { return !!impl_task_runner_.get(); } | 17 bool Proxy::HasImplThread() const { return !!impl_task_runner_.get(); } |
17 | 18 |
18 base::SingleThreadTaskRunner* Proxy::ImplThreadTaskRunner() const { | 19 base::SingleThreadTaskRunner* Proxy::ImplThreadTaskRunner() const { |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 | 63 |
63 #if DCHECK_IS_ON | 64 #if DCHECK_IS_ON |
64 void Proxy::SetMainThreadBlocked(bool is_main_thread_blocked) { | 65 void Proxy::SetMainThreadBlocked(bool is_main_thread_blocked) { |
65 is_main_thread_blocked_ = is_main_thread_blocked; | 66 is_main_thread_blocked_ = is_main_thread_blocked; |
66 } | 67 } |
67 #endif | 68 #endif |
68 | 69 |
69 Proxy::Proxy(scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, | 70 Proxy::Proxy(scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |
70 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) | 71 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) |
71 #if !DCHECK_IS_ON | 72 #if !DCHECK_IS_ON |
72 : main_task_runner_(main_task_runner), impl_task_runner_(impl_task_runner) { | 73 : main_task_runner_(main_task_runner), |
| 74 impl_task_runner_(impl_task_runner), |
| 75 blocking_main_thread_task_runner_(BlockingTaskRunner::current()) { |
73 #else | 76 #else |
74 : main_task_runner_(main_task_runner), | 77 : main_task_runner_(main_task_runner), |
75 impl_task_runner_(impl_task_runner), | 78 impl_task_runner_(impl_task_runner), |
| 79 blocking_main_thread_task_runner_(BlockingTaskRunner::current()), |
76 main_thread_id_(base::PlatformThread::CurrentId()), | 80 main_thread_id_(base::PlatformThread::CurrentId()), |
77 impl_thread_is_overridden_(false), | 81 impl_thread_is_overridden_(false), |
78 is_main_thread_blocked_(false) { | 82 is_main_thread_blocked_(false) { |
79 #endif | 83 #endif |
| 84 blocking_main_thread_task_runner_->SetTaskRunner(main_task_runner_); |
80 } | 85 } |
81 | 86 |
82 Proxy::~Proxy() { | 87 Proxy::~Proxy() { |
83 DCHECK(IsMainThread()); | 88 DCHECK(IsMainThread()); |
| 89 blocking_main_thread_task_runner_->SetTaskRunner( |
| 90 base::MessageLoopProxy::current()); |
84 } | 91 } |
85 | 92 |
86 } // namespace cc | 93 } // namespace cc |
OLD | NEW |