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 <set> |
8 #include <string> | 9 #include <string> |
9 | 10 |
| 11 #include "base/containers/hash_tables.h" |
10 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
11 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
12 #include "base/time/time.h" | 14 #include "base/time/time.h" |
13 #include "cc/animation/animation_events.h" | 15 #include "cc/animation/animation_events.h" |
14 #include "cc/base/completion_event.h" | 16 #include "cc/base/completion_event.h" |
15 #include "cc/base/delayed_unique_notifier.h" | 17 #include "cc/base/delayed_unique_notifier.h" |
16 #include "cc/resources/resource_update_controller.h" | 18 #include "cc/resources/resource_update_controller.h" |
17 #include "cc/scheduler/scheduler.h" | 19 #include "cc/scheduler/scheduler.h" |
18 #include "cc/trees/layer_tree_host_impl.h" | 20 #include "cc/trees/layer_tree_host_impl.h" |
19 #include "cc/trees/proxy.h" | 21 #include "cc/trees/proxy.h" |
(...skipping 24 matching lines...) Expand all Loading... |
44 | 46 |
45 virtual ~ThreadProxy(); | 47 virtual ~ThreadProxy(); |
46 | 48 |
47 struct BeginMainFrameAndCommitState { | 49 struct BeginMainFrameAndCommitState { |
48 BeginMainFrameAndCommitState(); | 50 BeginMainFrameAndCommitState(); |
49 ~BeginMainFrameAndCommitState(); | 51 ~BeginMainFrameAndCommitState(); |
50 | 52 |
51 unsigned int begin_frame_id; | 53 unsigned int begin_frame_id; |
52 BeginFrameArgs begin_frame_args; | 54 BeginFrameArgs begin_frame_args; |
53 scoped_ptr<ScrollAndScaleSet> scroll_info; | 55 scoped_ptr<ScrollAndScaleSet> scroll_info; |
| 56 scoped_ptr<CompositeTimingSet> smoothness_composite_counts; |
54 size_t memory_allocation_limit_bytes; | 57 size_t memory_allocation_limit_bytes; |
55 int memory_allocation_priority_cutoff; | 58 int memory_allocation_priority_cutoff; |
56 bool evicted_ui_resources; | 59 bool evicted_ui_resources; |
57 }; | 60 }; |
58 | 61 |
59 struct MainThreadOnly { | 62 struct MainThreadOnly { |
60 MainThreadOnly(ThreadProxy* proxy, int layer_tree_host_id); | 63 MainThreadOnly(ThreadProxy* proxy, int layer_tree_host_id); |
61 ~MainThreadOnly(); | 64 ~MainThreadOnly(); |
62 | 65 |
63 const int layer_tree_host_id; | 66 const int layer_tree_host_id; |
(...skipping 233 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 |