| 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_LAYER_TREE_HOST_COMMON_H_ | 5 #ifndef CC_TREES_LAYER_TREE_HOST_COMMON_H_ |
| 6 #define CC_TREES_LAYER_TREE_HOST_COMMON_H_ | 6 #define CC_TREES_LAYER_TREE_HOST_COMMON_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <limits> | 10 #include <limits> |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 }; | 177 }; |
| 178 | 178 |
| 179 struct CC_EXPORT ScrollAndScaleSet { | 179 struct CC_EXPORT ScrollAndScaleSet { |
| 180 ScrollAndScaleSet(); | 180 ScrollAndScaleSet(); |
| 181 ~ScrollAndScaleSet(); | 181 ~ScrollAndScaleSet(); |
| 182 | 182 |
| 183 std::vector<LayerTreeHostCommon::ScrollUpdateInfo> scrolls; | 183 std::vector<LayerTreeHostCommon::ScrollUpdateInfo> scrolls; |
| 184 float page_scale_delta; | 184 float page_scale_delta; |
| 185 gfx::Vector2dF elastic_overscroll_delta; | 185 gfx::Vector2dF elastic_overscroll_delta; |
| 186 float top_controls_delta; | 186 float top_controls_delta; |
| 187 std::vector<scoped_ptr<SwapPromise>> swap_promises; | 187 std::vector<std::unique_ptr<SwapPromise>> swap_promises; |
| 188 | 188 |
| 189 bool EqualsForTesting(const ScrollAndScaleSet& other) const; | 189 bool EqualsForTesting(const ScrollAndScaleSet& other) const; |
| 190 void ToProtobuf(proto::ScrollAndScaleSet* proto) const; | 190 void ToProtobuf(proto::ScrollAndScaleSet* proto) const; |
| 191 void FromProtobuf(const proto::ScrollAndScaleSet& proto); | 191 void FromProtobuf(const proto::ScrollAndScaleSet& proto); |
| 192 | 192 |
| 193 private: | 193 private: |
| 194 DISALLOW_COPY_AND_ASSIGN(ScrollAndScaleSet); | 194 DISALLOW_COPY_AND_ASSIGN(ScrollAndScaleSet); |
| 195 }; | 195 }; |
| 196 | 196 |
| 197 template <typename LayerType> | 197 template <typename LayerType> |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 for (auto* layer : *host_impl) | 258 for (auto* layer : *host_impl) |
| 259 CallFunctionForLayer(layer, function, type); | 259 CallFunctionForLayer(layer, function, type); |
| 260 } | 260 } |
| 261 | 261 |
| 262 CC_EXPORT PropertyTrees* GetPropertyTrees(Layer* layer); | 262 CC_EXPORT PropertyTrees* GetPropertyTrees(Layer* layer); |
| 263 CC_EXPORT PropertyTrees* GetPropertyTrees(LayerImpl* layer); | 263 CC_EXPORT PropertyTrees* GetPropertyTrees(LayerImpl* layer); |
| 264 | 264 |
| 265 } // namespace cc | 265 } // namespace cc |
| 266 | 266 |
| 267 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_ | 267 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_ |
| OLD | NEW |