| 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 | 87 |
| 88 PrioritizedResourceManager* contents_texture_manager(); | 88 PrioritizedResourceManager* contents_texture_manager(); |
| 89 | 89 |
| 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; | |
| 98 | |
| 99 struct CompositorThreadOnly { | 97 struct CompositorThreadOnly { |
| 100 CompositorThreadOnly( | 98 CompositorThreadOnly( |
| 101 ThreadProxy* proxy, | 99 ThreadProxy* proxy, |
| 102 int layer_tree_host_id, | 100 int layer_tree_host_id, |
| 103 RenderingStatsInstrumentation* rendering_stats_instrumentation); | 101 RenderingStatsInstrumentation* rendering_stats_instrumentation); |
| 104 ~CompositorThreadOnly(); | 102 ~CompositorThreadOnly(); |
| 105 | 103 |
| 106 const int layer_tree_host_id; | 104 const int layer_tree_host_id; |
| 107 | 105 |
| 108 // Copy of the main thread side contents texture manager for work | 106 // Copy of the main thread side contents texture manager for work |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 | 300 |
| 303 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; | 301 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; |
| 304 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; | 302 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; |
| 305 | 303 |
| 306 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); | 304 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); |
| 307 }; | 305 }; |
| 308 | 306 |
| 309 } // namespace cc | 307 } // namespace cc |
| 310 | 308 |
| 311 #endif // CC_TREES_THREAD_PROXY_H_ | 309 #endif // CC_TREES_THREAD_PROXY_H_ |
| OLD | NEW |