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