| 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 // Accessed on the main thread, or when main thread is blocked. | 83 // Accessed on the main thread, or when main thread is blocked. |
| 84 struct MainThreadOrBlockedMainThread { | 84 struct MainThreadOrBlockedMainThread { |
| 85 explicit MainThreadOrBlockedMainThread(LayerTreeHost* host); | 85 explicit MainThreadOrBlockedMainThread(LayerTreeHost* host); |
| 86 ~MainThreadOrBlockedMainThread(); | 86 ~MainThreadOrBlockedMainThread(); |
| 87 | 87 |
| 88 PrioritizedResourceManager* contents_texture_manager(); | 88 PrioritizedResourceManager* contents_texture_manager(); |
| 89 | 89 |
| 90 LayerTreeHost* layer_tree_host; | 90 LayerTreeHost* layer_tree_host; |
| 91 bool commit_waits_for_activation; | 91 bool commit_waits_for_activation; |
| 92 bool main_thread_inside_commit; | 92 bool main_thread_inside_commit; |
| 93 | |
| 94 base::TimeTicks last_monotonic_frame_begin_time; | |
| 95 }; | 93 }; |
| 96 | 94 |
| 97 struct CompositorThreadOnly { | 95 struct CompositorThreadOnly { |
| 98 CompositorThreadOnly( | 96 CompositorThreadOnly( |
| 99 ThreadProxy* proxy, | 97 ThreadProxy* proxy, |
| 100 int layer_tree_host_id, | 98 int layer_tree_host_id, |
| 101 RenderingStatsInstrumentation* rendering_stats_instrumentation); | 99 RenderingStatsInstrumentation* rendering_stats_instrumentation); |
| 102 ~CompositorThreadOnly(); | 100 ~CompositorThreadOnly(); |
| 103 | 101 |
| 104 const int layer_tree_host_id; | 102 const int layer_tree_host_id; |
| (...skipping 17 matching lines...) Expand all Loading... |
| 122 scoped_ptr<ResourceUpdateController> current_resource_update_controller; | 120 scoped_ptr<ResourceUpdateController> current_resource_update_controller; |
| 123 | 121 |
| 124 // Set when the next draw should post DidCommitAndDrawFrame to the main | 122 // Set when the next draw should post DidCommitAndDrawFrame to the main |
| 125 // thread. | 123 // thread. |
| 126 bool next_frame_is_newly_committed_frame; | 124 bool next_frame_is_newly_committed_frame; |
| 127 | 125 |
| 128 bool inside_draw; | 126 bool inside_draw; |
| 129 | 127 |
| 130 bool input_throttled_until_commit; | 128 bool input_throttled_until_commit; |
| 131 | 129 |
| 132 // Set when we freeze animations to avoid checkerboarding. | |
| 133 bool animations_frozen_until_next_draw; | |
| 134 base::TimeTicks animation_time; | 130 base::TimeTicks animation_time; |
| 135 | 131 |
| 136 // 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 |
| 137 // ticked. If this happens, we need to animate again. | 133 // ticked. If this happens, we need to animate again. |
| 138 bool did_commit_after_animating; | 134 bool did_commit_after_animating; |
| 139 | 135 |
| 140 DelayedUniqueNotifier smoothness_priority_expiration_notifier; | 136 DelayedUniqueNotifier smoothness_priority_expiration_notifier; |
| 141 | 137 |
| 142 ProxyTimingHistory timing_history; | 138 ProxyTimingHistory timing_history; |
| 143 | 139 |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 | 293 |
| 298 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; | 294 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; |
| 299 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; | 295 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; |
| 300 | 296 |
| 301 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); | 297 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); |
| 302 }; | 298 }; |
| 303 | 299 |
| 304 } // namespace cc | 300 } // namespace cc |
| 305 | 301 |
| 306 #endif // CC_TREES_THREAD_PROXY_H_ | 302 #endif // CC_TREES_THREAD_PROXY_H_ |
| OLD | NEW |