| 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 CompletionEvent* completion_event_for_commit_held_on_tree_activation; | 122 CompletionEvent* completion_event_for_commit_held_on_tree_activation; |
| 123 | 123 |
| 124 // Set when the next draw should post DidCommitAndDrawFrame to the main | 124 // Set when the next draw should post DidCommitAndDrawFrame to the main |
| 125 // thread. | 125 // thread. |
| 126 bool next_frame_is_newly_committed_frame; | 126 bool next_frame_is_newly_committed_frame; |
| 127 | 127 |
| 128 bool inside_draw; | 128 bool inside_draw; |
| 129 | 129 |
| 130 bool input_throttled_until_commit; | 130 bool input_throttled_until_commit; |
| 131 | 131 |
| 132 base::TimeTicks animation_time; | |
| 133 | |
| 134 // Whether a commit has been completed since the last time animations were | 132 // Whether a commit has been completed since the last time animations were |
| 135 // ticked. If this happens, we need to animate again. | 133 // ticked. If this happens, we need to animate again. |
| 136 bool did_commit_after_animating; | 134 bool did_commit_after_animating; |
| 137 | 135 |
| 138 DelayedUniqueNotifier smoothness_priority_expiration_notifier; | 136 DelayedUniqueNotifier smoothness_priority_expiration_notifier; |
| 139 | 137 |
| 140 scoped_ptr<BeginFrameSource> external_begin_frame_source; | 138 scoped_ptr<BeginFrameSource> external_begin_frame_source; |
| 141 | 139 |
| 142 RenderingStatsInstrumentation* rendering_stats_instrumentation; | 140 RenderingStatsInstrumentation* rendering_stats_instrumentation; |
| 143 | 141 |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 | 305 |
| 308 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; | 306 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; |
| 309 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; | 307 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; |
| 310 | 308 |
| 311 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); | 309 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); |
| 312 }; | 310 }; |
| 313 | 311 |
| 314 } // namespace cc | 312 } // namespace cc |
| 315 | 313 |
| 316 #endif // CC_TREES_THREAD_PROXY_H_ | 314 #endif // CC_TREES_THREAD_PROXY_H_ |
| OLD | NEW |