| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef CC_TREES_THREADED_CHANNEL_H_ | 5 #ifndef CC_TREES_THREADED_CHANNEL_H_ |
| 6 #define CC_TREES_THREADED_CHANNEL_H_ | 6 #define CC_TREES_THREADED_CHANNEL_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 9 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
| 11 #include "cc/base/cc_export.h" | 12 #include "cc/base/cc_export.h" |
| 12 #include "cc/trees/channel_impl.h" | 13 #include "cc/trees/channel_impl.h" |
| 13 #include "cc/trees/channel_main.h" | 14 #include "cc/trees/channel_main.h" |
| 14 #include "cc/trees/proxy_common.h" | 15 #include "cc/trees/proxy_common.h" |
| 15 #include "cc/trees/proxy_impl.h" | 16 #include "cc/trees/proxy_impl.h" |
| 16 #include "cc/trees/proxy_main.h" | 17 #include "cc/trees/proxy_main.h" |
| 17 | 18 |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 // Used on the main thread to safely queue calls to ProxyImpl to be run on the | 211 // Used on the main thread to safely queue calls to ProxyImpl to be run on the |
| 211 // impl thread. | 212 // impl thread. |
| 212 base::WeakPtr<ProxyImpl> proxy_impl_weak_ptr_; | 213 base::WeakPtr<ProxyImpl> proxy_impl_weak_ptr_; |
| 213 | 214 |
| 214 DISALLOW_COPY_AND_ASSIGN(ThreadedChannel); | 215 DISALLOW_COPY_AND_ASSIGN(ThreadedChannel); |
| 215 }; | 216 }; |
| 216 | 217 |
| 217 } // namespace cc | 218 } // namespace cc |
| 218 | 219 |
| 219 #endif // CC_TREES_THREADED_CHANNEL_H_ | 220 #endif // CC_TREES_THREADED_CHANNEL_H_ |
| OLD | NEW |