| 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 // Whether a commit has been completed since the last time animations were | 136 // Whether a commit has been completed since the last time animations were |
| 137 // ticked. If this happens, we need to animate again. | 137 // ticked. If this happens, we need to animate again. |
| 138 bool did_commit_after_animating; | 138 bool did_commit_after_animating; |
| 139 | 139 |
| 140 DelayedUniqueNotifier smoothness_priority_expiration_notifier; | 140 DelayedUniqueNotifier smoothness_priority_expiration_notifier; |
| 141 | 141 |
| 142 ProxyTimingHistory timing_history; | 142 ProxyTimingHistory timing_history; |
| 143 | 143 |
| 144 scoped_ptr<BeginFrameSource> external_begin_frame_source; | 144 scoped_ptr<BeginFrameSource> external_begin_frame_source; |
| 145 | 145 |
| 146 // Values used to keep track of frame durations. Used only in frame timing. |
| 147 BeginFrameArgs last_begin_main_frame_args; |
| 148 BeginFrameArgs last_processed_begin_main_frame_args; |
| 149 |
| 146 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl; | 150 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl; |
| 147 base::WeakPtrFactory<ThreadProxy> weak_factory; | 151 base::WeakPtrFactory<ThreadProxy> weak_factory; |
| 148 }; | 152 }; |
| 149 | 153 |
| 150 const MainThreadOnly& main() const; | 154 const MainThreadOnly& main() const; |
| 151 const MainThreadOrBlockedMainThread& blocked_main() const; | 155 const MainThreadOrBlockedMainThread& blocked_main() const; |
| 152 const CompositorThreadOnly& impl() const; | 156 const CompositorThreadOnly& impl() const; |
| 153 | 157 |
| 154 // Proxy implementation | 158 // Proxy implementation |
| 155 void FinishAllRendering() override; | 159 void FinishAllRendering() override; |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 | 306 |
| 303 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; | 307 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; |
| 304 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; | 308 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; |
| 305 | 309 |
| 306 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); | 310 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); |
| 307 }; | 311 }; |
| 308 | 312 |
| 309 } // namespace cc | 313 } // namespace cc |
| 310 | 314 |
| 311 #endif // CC_TREES_THREAD_PROXY_H_ | 315 #endif // CC_TREES_THREAD_PROXY_H_ |
| OLD | NEW |