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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
282 // Used for computing samples added to | 282 // Used for computing samples added to |
283 // begin_main_frame_to_commit_duration_history_ and | 283 // begin_main_frame_to_commit_duration_history_ and |
284 // activation_duration_history_. | 284 // activation_duration_history_. |
285 base::TimeTicks begin_main_frame_sent_time_; | 285 base::TimeTicks begin_main_frame_sent_time_; |
286 base::TimeTicks commit_complete_time_; | 286 base::TimeTicks commit_complete_time_; |
287 | 287 |
288 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; | 288 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; |
289 base::WeakPtrFactory<ThreadProxy> weak_factory_on_impl_thread_; | 289 base::WeakPtrFactory<ThreadProxy> weak_factory_on_impl_thread_; |
290 base::WeakPtrFactory<ThreadProxy> weak_factory_; | 290 base::WeakPtrFactory<ThreadProxy> weak_factory_; |
291 | 291 |
| 292 const int layer_tree_host_id_; |
| 293 |
292 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); | 294 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); |
293 }; | 295 }; |
294 | 296 |
295 } // namespace cc | 297 } // namespace cc |
296 | 298 |
297 #endif // CC_TREES_THREAD_PROXY_H_ | 299 #endif // CC_TREES_THREAD_PROXY_H_ |
OLD | NEW |