| 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_mutation.h" |
| 11 |
| 10 #include "cc/base/cc_export.h" | 12 #include "cc/base/cc_export.h" |
| 11 #include "cc/output/begin_frame_args.h" | 13 #include "cc/output/begin_frame_args.h" |
| 12 #include "cc/trees/layer_tree_host_common.h" | 14 #include "cc/trees/layer_tree_host_common.h" |
| 13 | 15 |
| 14 namespace cc { | 16 namespace cc { |
| 15 class LayerTreeHost; | 17 class LayerTreeHost; |
| 16 | 18 |
| 17 struct CC_EXPORT BeginMainFrameAndCommitState { | 19 struct CC_EXPORT BeginMainFrameAndCommitState { |
| 18 BeginMainFrameAndCommitState(); | 20 BeginMainFrameAndCommitState(); |
| 19 ~BeginMainFrameAndCommitState(); | 21 ~BeginMainFrameAndCommitState(); |
| 20 | 22 |
| 21 unsigned int begin_frame_id; | 23 unsigned int begin_frame_id; |
| 22 BeginFrameArgs begin_frame_args; | 24 BeginFrameArgs begin_frame_args; |
| 23 scoped_ptr<ScrollAndScaleSet> scroll_info; | 25 scoped_ptr<ScrollAndScaleSet> scroll_info; |
| 26 scoped_ptr<LayerTreeMutationMap> mutations; |
| 24 size_t memory_allocation_limit_bytes; | 27 size_t memory_allocation_limit_bytes; |
| 25 bool evicted_ui_resources; | 28 bool evicted_ui_resources; |
| 26 }; | 29 }; |
| 27 | 30 |
| 28 } // namespace cc | 31 } // namespace cc |
| 29 | 32 |
| 30 #endif // CC_TREES_PROXY_COMMON_H_ | 33 #endif // CC_TREES_PROXY_COMMON_H_ |
| OLD | NEW |