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