| 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_THREAD_PROXY_H_ | 5 #ifndef CC_TREES_THREAD_PROXY_H_ |
| 6 #define CC_TREES_THREAD_PROXY_H_ | 6 #define CC_TREES_THREAD_PROXY_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_; | 221 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_; |
| 222 | 222 |
| 223 scoped_ptr<Scheduler> scheduler_on_impl_thread_; | 223 scoped_ptr<Scheduler> scheduler_on_impl_thread_; |
| 224 bool frame_did_draw_; | 224 bool frame_did_draw_; |
| 225 | 225 |
| 226 // Set when the main thread is waiting on a | 226 // Set when the main thread is waiting on a |
| 227 // ScheduledActionSendBeginFrameToMainThread to be issued. | 227 // ScheduledActionSendBeginFrameToMainThread to be issued. |
| 228 CompletionEvent* | 228 CompletionEvent* |
| 229 begin_frame_sent_to_main_thread_completion_event_on_impl_thread_; | 229 begin_frame_sent_to_main_thread_completion_event_on_impl_thread_; |
| 230 | 230 |
| 231 // Set when there is a pending tree on a commit. |
| 232 base::Closure deferred_start_commit_on_impl_thread_; |
| 233 |
| 231 // Set when the main thread is waiting on a readback. | 234 // Set when the main thread is waiting on a readback. |
| 232 ReadbackRequest* readback_request_on_impl_thread_; | 235 ReadbackRequest* readback_request_on_impl_thread_; |
| 233 | 236 |
| 234 // Set when the main thread is waiting on a commit to complete. | 237 // Set when the main thread is waiting on a commit to complete. |
| 235 CompletionEvent* commit_completion_event_on_impl_thread_; | 238 CompletionEvent* commit_completion_event_on_impl_thread_; |
| 236 | 239 |
| 237 // Set when the main thread is waiting on a pending tree activation. | 240 // Set when the main thread is waiting on a pending tree activation. |
| 238 CompletionEvent* completion_event_for_commit_held_on_tree_activation_; | 241 CompletionEvent* completion_event_for_commit_held_on_tree_activation_; |
| 239 | 242 |
| 240 // Set when the main thread is waiting on layers to be drawn. | 243 // Set when the main thread is waiting on layers to be drawn. |
| (...skipping 30 matching lines...) Expand all Loading... |
| 271 // activation_duration_history_. | 274 // activation_duration_history_. |
| 272 base::TimeTicks begin_frame_sent_to_main_thread_time_; | 275 base::TimeTicks begin_frame_sent_to_main_thread_time_; |
| 273 base::TimeTicks commit_complete_time_; | 276 base::TimeTicks commit_complete_time_; |
| 274 | 277 |
| 275 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); | 278 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); |
| 276 }; | 279 }; |
| 277 | 280 |
| 278 } // namespace cc | 281 } // namespace cc |
| 279 | 282 |
| 280 #endif // CC_TREES_THREAD_PROXY_H_ | 283 #endif // CC_TREES_THREAD_PROXY_H_ |
| OLD | NEW |