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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
48 | 48 |
49 ~ThreadProxy() override; | 49 ~ThreadProxy() override; |
50 | 50 |
51 struct BeginMainFrameAndCommitState { | 51 struct BeginMainFrameAndCommitState { |
52 BeginMainFrameAndCommitState(); | 52 BeginMainFrameAndCommitState(); |
53 ~BeginMainFrameAndCommitState(); | 53 ~BeginMainFrameAndCommitState(); |
54 | 54 |
55 unsigned int begin_frame_id; | 55 unsigned int begin_frame_id; |
56 BeginFrameArgs begin_frame_args; | 56 BeginFrameArgs begin_frame_args; |
57 scoped_ptr<ScrollAndScaleSet> scroll_info; | 57 scoped_ptr<ScrollAndScaleSet> scroll_info; |
58 scoped_ptr<FrameTimingTracker::CompositeTimingSet> frame_composite_counts; | |
vmpstr
2015/05/12 23:48:25
I would name this something like frame_composite_e
MikeB
2015/05/21 21:53:08
Done.
| |
59 scoped_ptr<FrameTimingTracker::MainFrameTimingSet> frame_render_counts; | |
58 size_t memory_allocation_limit_bytes; | 60 size_t memory_allocation_limit_bytes; |
59 int memory_allocation_priority_cutoff; | 61 int memory_allocation_priority_cutoff; |
60 bool evicted_ui_resources; | 62 bool evicted_ui_resources; |
61 }; | 63 }; |
62 | 64 |
63 struct MainThreadOnly { | 65 struct MainThreadOnly { |
64 MainThreadOnly(ThreadProxy* proxy, int layer_tree_host_id); | 66 MainThreadOnly(ThreadProxy* proxy, int layer_tree_host_id); |
65 ~MainThreadOnly(); | 67 ~MainThreadOnly(); |
66 | 68 |
67 const int layer_tree_host_id; | 69 const int layer_tree_host_id; |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
310 | 312 |
311 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; | 313 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; |
312 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; | 314 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; |
313 | 315 |
314 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); | 316 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); |
315 }; | 317 }; |
316 | 318 |
317 } // namespace cc | 319 } // namespace cc |
318 | 320 |
319 #endif // CC_TREES_THREAD_PROXY_H_ | 321 #endif // CC_TREES_THREAD_PROXY_H_ |
OLD | NEW |