OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_PROXY_COMMON_H_ | 5 #ifndef CC_TREES_PROXY_COMMON_H_ |
6 #define CC_TREES_PROXY_COMMON_H_ | 6 #define CC_TREES_PROXY_COMMON_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
| 10 #include "cc/animation/layer_tree_mutations.h" |
10 #include "cc/base/cc_export.h" | 11 #include "cc/base/cc_export.h" |
11 #include "cc/output/begin_frame_args.h" | 12 #include "cc/output/begin_frame_args.h" |
12 #include "cc/trees/layer_tree_host_common.h" | 13 #include "cc/trees/layer_tree_host_common.h" |
13 | 14 |
14 namespace cc { | 15 namespace cc { |
15 | 16 |
16 namespace proto { | 17 namespace proto { |
17 class BeginMainFrameAndCommitState; | 18 class BeginMainFrameAndCommitState; |
18 } | 19 } |
19 | 20 |
20 class LayerTreeHost; | 21 class LayerTreeHost; |
21 | 22 |
22 struct CC_EXPORT BeginMainFrameAndCommitState { | 23 struct CC_EXPORT BeginMainFrameAndCommitState { |
23 BeginMainFrameAndCommitState(); | 24 BeginMainFrameAndCommitState(); |
24 ~BeginMainFrameAndCommitState(); | 25 ~BeginMainFrameAndCommitState(); |
25 | 26 |
26 unsigned int begin_frame_id; | 27 unsigned int begin_frame_id; |
27 BeginFrameArgs begin_frame_args; | 28 BeginFrameArgs begin_frame_args; |
28 scoped_ptr<ScrollAndScaleSet> scroll_info; | 29 scoped_ptr<ScrollAndScaleSet> scroll_info; |
| 30 scoped_ptr<LayerTreeMutations> mutations; |
29 size_t memory_allocation_limit_bytes; | 31 size_t memory_allocation_limit_bytes; |
30 bool evicted_ui_resources; | 32 bool evicted_ui_resources; |
31 | 33 |
32 void ToProtobuf(proto::BeginMainFrameAndCommitState* proto) const; | 34 void ToProtobuf(proto::BeginMainFrameAndCommitState* proto) const; |
33 void FromProtobuf(const proto::BeginMainFrameAndCommitState& proto); | 35 void FromProtobuf(const proto::BeginMainFrameAndCommitState& proto); |
34 }; | 36 }; |
35 | 37 |
36 } // namespace cc | 38 } // namespace cc |
37 | 39 |
38 #endif // CC_TREES_PROXY_COMMON_H_ | 40 #endif // CC_TREES_PROXY_COMMON_H_ |
OLD | NEW |