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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 // Accessed on main thread only. | 149 // Accessed on main thread only. |
150 LayerTreeHost* layer_tree_host_; | 150 LayerTreeHost* layer_tree_host_; |
151 LayerTreeHostSingleThreadClient* client_; | 151 LayerTreeHostSingleThreadClient* client_; |
152 | 152 |
153 // Used on the Thread, but checked on main thread during | 153 // Used on the Thread, but checked on main thread during |
154 // initialization/shutdown. | 154 // initialization/shutdown. |
155 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_; | 155 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_; |
156 RendererCapabilities renderer_capabilities_for_main_thread_; | 156 RendererCapabilities renderer_capabilities_for_main_thread_; |
157 | 157 |
158 // Accessed from both threads. | 158 // Accessed from both threads. |
| 159 scoped_ptr<BeginFrameSource> external_begin_frame_source_; |
159 scoped_ptr<Scheduler> scheduler_on_impl_thread_; | 160 scoped_ptr<Scheduler> scheduler_on_impl_thread_; |
160 ProxyTimingHistory timing_history_; | 161 ProxyTimingHistory timing_history_; |
161 | 162 |
162 scoped_ptr<BlockingTaskRunner::CapturePostTasks> commit_blocking_task_runner_; | 163 scoped_ptr<BlockingTaskRunner::CapturePostTasks> commit_blocking_task_runner_; |
163 scoped_ptr<ResourceUpdateQueue> queue_for_commit_; | 164 scoped_ptr<ResourceUpdateQueue> queue_for_commit_; |
164 bool next_frame_is_newly_committed_frame_; | 165 bool next_frame_is_newly_committed_frame_; |
165 | 166 |
166 #if DCHECK_IS_ON() | 167 #if DCHECK_IS_ON() |
167 bool inside_impl_frame_; | 168 bool inside_impl_frame_; |
168 #endif | 169 #endif |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 private: | 242 private: |
242 DebugScopedSetImplThread impl_thread_; | 243 DebugScopedSetImplThread impl_thread_; |
243 DebugScopedSetMainThreadBlocked main_thread_blocked_; | 244 DebugScopedSetMainThreadBlocked main_thread_blocked_; |
244 | 245 |
245 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); | 246 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); |
246 }; | 247 }; |
247 | 248 |
248 } // namespace cc | 249 } // namespace cc |
249 | 250 |
250 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ | 251 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ |
OLD | NEW |