| 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 #ifndef CC_TREES_SINGLE_THREAD_PROXY_H_ | 5 #ifndef CC_TREES_SINGLE_THREAD_PROXY_H_ |
| 6 #define CC_TREES_SINGLE_THREAD_PROXY_H_ | 6 #define CC_TREES_SINGLE_THREAD_PROXY_H_ |
| 7 | 7 |
| 8 #include <limits> | 8 #include <limits> |
| 9 | 9 |
| 10 #include "base/cancelable_callback.h" | 10 #include "base/cancelable_callback.h" |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 bool commit_requested_; | 165 bool commit_requested_; |
| 166 bool inside_synchronous_composite_; | 166 bool inside_synchronous_composite_; |
| 167 | 167 |
| 168 // True if a request to the LayerTreeHostClient to create an output surface | 168 // True if a request to the LayerTreeHostClient to create an output surface |
| 169 // is still outstanding. | 169 // is still outstanding. |
| 170 bool output_surface_creation_requested_; | 170 bool output_surface_creation_requested_; |
| 171 | 171 |
| 172 // This is the callback for the scheduled RequestNewOutputSurface. | 172 // This is the callback for the scheduled RequestNewOutputSurface. |
| 173 base::CancelableClosure output_surface_creation_callback_; | 173 base::CancelableClosure output_surface_creation_callback_; |
| 174 | 174 |
| 175 scoped_ptr<BeginFrameSource> external_begin_frame_source_; | |
| 176 | |
| 177 base::WeakPtrFactory<SingleThreadProxy> weak_factory_; | 175 base::WeakPtrFactory<SingleThreadProxy> weak_factory_; |
| 178 | 176 |
| 179 DISALLOW_COPY_AND_ASSIGN(SingleThreadProxy); | 177 DISALLOW_COPY_AND_ASSIGN(SingleThreadProxy); |
| 180 }; | 178 }; |
| 181 | 179 |
| 182 // For use in the single-threaded case. In debug builds, it pretends that the | 180 // For use in the single-threaded case. In debug builds, it pretends that the |
| 183 // code is running on the impl thread to satisfy assertion checks. | 181 // code is running on the impl thread to satisfy assertion checks. |
| 184 class DebugScopedSetImplThread { | 182 class DebugScopedSetImplThread { |
| 185 public: | 183 public: |
| 186 explicit DebugScopedSetImplThread(Proxy* proxy) : proxy_(proxy) { | 184 explicit DebugScopedSetImplThread(Proxy* proxy) : proxy_(proxy) { |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 private: | 234 private: |
| 237 DebugScopedSetImplThread impl_thread_; | 235 DebugScopedSetImplThread impl_thread_; |
| 238 DebugScopedSetMainThreadBlocked main_thread_blocked_; | 236 DebugScopedSetMainThreadBlocked main_thread_blocked_; |
| 239 | 237 |
| 240 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); | 238 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); |
| 241 }; | 239 }; |
| 242 | 240 |
| 243 } // namespace cc | 241 } // namespace cc |
| 244 | 242 |
| 245 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ | 243 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ |
| OLD | NEW |