| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 LayerTreeHost* layer_tree_host; | 89 LayerTreeHost* layer_tree_host; |
| 90 bool commit_waits_for_activation; | 90 bool commit_waits_for_activation; |
| 91 bool main_thread_inside_commit; | 91 bool main_thread_inside_commit; |
| 92 | 92 |
| 93 base::TimeTicks last_monotonic_frame_begin_time; | 93 base::TimeTicks last_monotonic_frame_begin_time; |
| 94 }; | 94 }; |
| 95 | 95 |
| 96 struct ReadbackRequest; | 96 struct ReadbackRequest; |
| 97 | 97 |
| 98 struct CompositorThreadOnly { | 98 struct CompositorThreadOnly { |
| 99 CompositorThreadOnly(ThreadProxy* proxy, int layer_tree_host_id); | 99 CompositorThreadOnly( |
| 100 ThreadProxy* proxy, |
| 101 int layer_tree_host_id, |
| 102 RenderingStatsInstrumentation* rendering_stats_instrumentation); |
| 100 ~CompositorThreadOnly(); | 103 ~CompositorThreadOnly(); |
| 101 | 104 |
| 102 const int layer_tree_host_id; | 105 const int layer_tree_host_id; |
| 103 | 106 |
| 104 // Copy of the main thread side contents texture manager for work | 107 // Copy of the main thread side contents texture manager for work |
| 105 // that needs to be done on the compositor thread. | 108 // that needs to be done on the compositor thread. |
| 106 PrioritizedResourceManager* contents_texture_manager; | 109 PrioritizedResourceManager* contents_texture_manager; |
| 107 | 110 |
| 108 scoped_ptr<Scheduler> scheduler; | 111 scoped_ptr<Scheduler> scheduler; |
| 109 | 112 |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 | 300 |
| 298 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; | 301 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; |
| 299 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; | 302 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; |
| 300 | 303 |
| 301 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); | 304 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); |
| 302 }; | 305 }; |
| 303 | 306 |
| 304 } // namespace cc | 307 } // namespace cc |
| 305 | 308 |
| 306 #endif // CC_TREES_THREAD_PROXY_H_ | 309 #endif // CC_TREES_THREAD_PROXY_H_ |
| OLD | NEW |