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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 // Accessed on main thread only. | 144 // Accessed on main thread only. |
145 LayerTreeHost* layer_tree_host_; | 145 LayerTreeHost* layer_tree_host_; |
146 LayerTreeHostSingleThreadClient* client_; | 146 LayerTreeHostSingleThreadClient* client_; |
147 | 147 |
148 // Used on the Thread, but checked on main thread during | 148 // Used on the Thread, but checked on main thread during |
149 // initialization/shutdown. | 149 // initialization/shutdown. |
150 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_; | 150 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_; |
151 RendererCapabilities renderer_capabilities_for_main_thread_; | 151 RendererCapabilities renderer_capabilities_for_main_thread_; |
152 | 152 |
153 // Accessed from both threads. | 153 // Accessed from both threads. |
| 154 scoped_ptr<BeginFrameSource> external_begin_frame_source_; |
154 scoped_ptr<Scheduler> scheduler_on_impl_thread_; | 155 scoped_ptr<Scheduler> scheduler_on_impl_thread_; |
155 ProxyTimingHistory timing_history_; | 156 ProxyTimingHistory timing_history_; |
156 | 157 |
157 scoped_ptr<BlockingTaskRunner::CapturePostTasks> commit_blocking_task_runner_; | 158 scoped_ptr<BlockingTaskRunner::CapturePostTasks> commit_blocking_task_runner_; |
158 bool next_frame_is_newly_committed_frame_; | 159 bool next_frame_is_newly_committed_frame_; |
159 | 160 |
160 #if DCHECK_IS_ON() | 161 #if DCHECK_IS_ON() |
161 bool inside_impl_frame_; | 162 bool inside_impl_frame_; |
162 #endif | 163 #endif |
163 bool inside_draw_; | 164 bool inside_draw_; |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 private: | 236 private: |
236 DebugScopedSetImplThread impl_thread_; | 237 DebugScopedSetImplThread impl_thread_; |
237 DebugScopedSetMainThreadBlocked main_thread_blocked_; | 238 DebugScopedSetMainThreadBlocked main_thread_blocked_; |
238 | 239 |
239 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); | 240 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); |
240 }; | 241 }; |
241 | 242 |
242 } // namespace cc | 243 } // namespace cc |
243 | 244 |
244 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ | 245 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ |
OLD | NEW |