| 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 | 138 |
| 139 TaskRunnerProvider* task_runner_provider_; | 139 TaskRunnerProvider* task_runner_provider_; |
| 140 | 140 |
| 141 // Used on the Thread, but checked on main thread during | 141 // Used on the Thread, but checked on main thread during |
| 142 // initialization/shutdown. | 142 // initialization/shutdown. |
| 143 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_; | 143 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_; |
| 144 RendererCapabilities renderer_capabilities_for_main_thread_; | 144 RendererCapabilities renderer_capabilities_for_main_thread_; |
| 145 | 145 |
| 146 // Accessed from both threads. | 146 // Accessed from both threads. |
| 147 scoped_ptr<BeginFrameSource> external_begin_frame_source_; | 147 scoped_ptr<BeginFrameSource> external_begin_frame_source_; |
| 148 scoped_ptr<BeginFrameSource> unthrottled_begin_frame_source_; |
| 149 scoped_ptr<SyntheticBeginFrameSource> synthetic_begin_frame_source_; |
| 148 scoped_ptr<Scheduler> scheduler_on_impl_thread_; | 150 scoped_ptr<Scheduler> scheduler_on_impl_thread_; |
| 149 | 151 |
| 152 base::TimeDelta authoritative_vsync_interval_; |
| 153 base::TimeTicks last_vsync_timebase_; |
| 154 |
| 150 scoped_ptr<BlockingTaskRunner::CapturePostTasks> commit_blocking_task_runner_; | 155 scoped_ptr<BlockingTaskRunner::CapturePostTasks> commit_blocking_task_runner_; |
| 151 bool next_frame_is_newly_committed_frame_; | 156 bool next_frame_is_newly_committed_frame_; |
| 152 | 157 |
| 153 #if DCHECK_IS_ON() | 158 #if DCHECK_IS_ON() |
| 154 bool inside_impl_frame_; | 159 bool inside_impl_frame_; |
| 155 #endif | 160 #endif |
| 156 bool inside_draw_; | 161 bool inside_draw_; |
| 157 bool defer_commits_; | 162 bool defer_commits_; |
| 158 bool animate_requested_; | 163 bool animate_requested_; |
| 159 bool commit_requested_; | 164 bool commit_requested_; |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 private: | 237 private: |
| 233 DebugScopedSetImplThread impl_thread_; | 238 DebugScopedSetImplThread impl_thread_; |
| 234 DebugScopedSetMainThreadBlocked main_thread_blocked_; | 239 DebugScopedSetMainThreadBlocked main_thread_blocked_; |
| 235 | 240 |
| 236 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); | 241 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); |
| 237 }; | 242 }; |
| 238 | 243 |
| 239 } // namespace cc | 244 } // namespace cc |
| 240 | 245 |
| 241 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ | 246 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ |
| OLD | NEW |