| 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/proxy.h" | 5 #include "cc/proxy.h" |
| 6 | 6 |
| 7 #include "cc/thread.h" | 7 #include "cc/base/thread.h" |
| 8 #include "cc/thread_impl.h" | 8 #include "cc/base/thread_impl.h" |
| 9 | 9 |
| 10 namespace cc { | 10 namespace cc { |
| 11 | 11 |
| 12 Thread* Proxy::MainThread() const { return main_thread_.get(); } | 12 Thread* Proxy::MainThread() const { return main_thread_.get(); } |
| 13 | 13 |
| 14 bool Proxy::HasImplThread() const { return impl_thread_; } | 14 bool Proxy::HasImplThread() const { return impl_thread_; } |
| 15 | 15 |
| 16 Thread* Proxy::ImplThread() const { return impl_thread_.get(); } | 16 Thread* Proxy::ImplThread() const { return impl_thread_.get(); } |
| 17 | 17 |
| 18 Thread* Proxy::CurrentThread() const { | 18 Thread* Proxy::CurrentThread() const { |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 impl_thread_(impl_thread.Pass()), | 72 impl_thread_(impl_thread.Pass()), |
| 73 impl_thread_is_overridden_(false), | 73 impl_thread_is_overridden_(false), |
| 74 is_main_thread_blocked_(false) {} | 74 is_main_thread_blocked_(false) {} |
| 75 #endif | 75 #endif |
| 76 | 76 |
| 77 Proxy::~Proxy() { | 77 Proxy::~Proxy() { |
| 78 DCHECK(IsMainThread()); | 78 DCHECK(IsMainThread()); |
| 79 } | 79 } |
| 80 | 80 |
| 81 } // namespace cc | 81 } // namespace cc |
| OLD | NEW |