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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 // Used for computing samples added to | 270 // Used for computing samples added to |
271 // begin_main_frame_to_commit_duration_history_ and | 271 // begin_main_frame_to_commit_duration_history_ and |
272 // activation_duration_history_. | 272 // activation_duration_history_. |
273 base::TimeTicks begin_main_frame_sent_time_; | 273 base::TimeTicks begin_main_frame_sent_time_; |
274 base::TimeTicks commit_complete_time_; | 274 base::TimeTicks commit_complete_time_; |
275 | 275 |
276 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; | 276 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; |
277 base::WeakPtrFactory<ThreadProxy> weak_factory_on_impl_thread_; | 277 base::WeakPtrFactory<ThreadProxy> weak_factory_on_impl_thread_; |
278 base::WeakPtrFactory<ThreadProxy> weak_factory_; | 278 base::WeakPtrFactory<ThreadProxy> weak_factory_; |
279 | 279 |
| 280 const int layer_tree_host_id_; |
| 281 |
280 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); | 282 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); |
281 }; | 283 }; |
282 | 284 |
283 } // namespace cc | 285 } // namespace cc |
284 | 286 |
285 #endif // CC_TREES_THREAD_PROXY_H_ | 287 #endif // CC_TREES_THREAD_PROXY_H_ |
OLD | NEW |