| 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 // Accessed from both threads. | 145 // Accessed from both threads. |
| 146 scoped_ptr<Scheduler> scheduler_on_impl_thread_; | 146 scoped_ptr<Scheduler> scheduler_on_impl_thread_; |
| 147 ProxyTimingHistory timing_history_; | 147 ProxyTimingHistory timing_history_; |
| 148 | 148 |
| 149 scoped_ptr<BlockingTaskRunner::CapturePostTasks> commit_blocking_task_runner_; | 149 scoped_ptr<BlockingTaskRunner::CapturePostTasks> commit_blocking_task_runner_; |
| 150 scoped_ptr<ResourceUpdateQueue> queue_for_commit_; | 150 scoped_ptr<ResourceUpdateQueue> queue_for_commit_; |
| 151 bool next_frame_is_newly_committed_frame_; | 151 bool next_frame_is_newly_committed_frame_; |
| 152 | 152 |
| 153 bool inside_draw_; | 153 bool inside_draw_; |
| 154 bool defer_commits_; | 154 bool defer_commits_; |
| 155 bool commit_was_deferred_; | |
| 156 bool commit_requested_; | 155 bool commit_requested_; |
| 157 bool inside_synchronous_composite_; | 156 bool inside_synchronous_composite_; |
| 158 | 157 |
| 159 // True if a request to the LayerTreeHostClient to create an output surface | 158 // True if a request to the LayerTreeHostClient to create an output surface |
| 160 // is still outstanding. | 159 // is still outstanding. |
| 161 bool output_surface_creation_requested_; | 160 bool output_surface_creation_requested_; |
| 162 | 161 |
| 163 // This is the callback for the scheduled RequestNewOutputSurface. | 162 // This is the callback for the scheduled RequestNewOutputSurface. |
| 164 base::CancelableClosure output_surface_creation_callback_; | 163 base::CancelableClosure output_surface_creation_callback_; |
| 165 | 164 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 private: | 226 private: |
| 228 DebugScopedSetImplThread impl_thread_; | 227 DebugScopedSetImplThread impl_thread_; |
| 229 DebugScopedSetMainThreadBlocked main_thread_blocked_; | 228 DebugScopedSetMainThreadBlocked main_thread_blocked_; |
| 230 | 229 |
| 231 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); | 230 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); |
| 232 }; | 231 }; |
| 233 | 232 |
| 234 } // namespace cc | 233 } // namespace cc |
| 235 | 234 |
| 236 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ | 235 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ |
| OLD | NEW |