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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
170 // current page scale, the two must be committed at the same time to prevent | 170 // current page scale, the two must be committed at the same time to prevent |
171 // clamping. | 171 // clamping. |
172 LayerTreeHostCommon::ScrollUpdateInfo inner_viewport_scroll; | 172 LayerTreeHostCommon::ScrollUpdateInfo inner_viewport_scroll; |
173 | 173 |
174 std::vector<LayerTreeHostCommon::ScrollUpdateInfo> scrolls; | 174 std::vector<LayerTreeHostCommon::ScrollUpdateInfo> scrolls; |
175 float page_scale_delta; | 175 float page_scale_delta; |
176 gfx::Vector2dF elastic_overscroll_delta; | 176 gfx::Vector2dF elastic_overscroll_delta; |
177 float top_controls_delta; | 177 float top_controls_delta; |
178 std::vector<LayerTreeHostCommon::ScrollbarsUpdateInfo> scrollbars; | 178 std::vector<LayerTreeHostCommon::ScrollbarsUpdateInfo> scrollbars; |
179 std::vector<std::unique_ptr<SwapPromise>> swap_promises; | 179 std::vector<std::unique_ptr<SwapPromise>> swap_promises; |
180 bool has_scrolled_by_wheel; | |
danakj
2017/03/16 15:19:21
where do these get init to false?
sahel
2017/03/17 21:02:34
Done.
| |
181 bool has_scrolled_by_touch; | |
180 | 182 |
181 private: | 183 private: |
182 DISALLOW_COPY_AND_ASSIGN(ScrollAndScaleSet); | 184 DISALLOW_COPY_AND_ASSIGN(ScrollAndScaleSet); |
183 }; | 185 }; |
184 | 186 |
185 template <typename Function> | 187 template <typename Function> |
186 void LayerTreeHostCommon::CallFunctionForEveryLayer(LayerTreeHost* host, | 188 void LayerTreeHostCommon::CallFunctionForEveryLayer(LayerTreeHost* host, |
187 const Function& function) { | 189 const Function& function) { |
188 for (auto* layer : *host) { | 190 for (auto* layer : *host) { |
189 function(layer); | 191 function(layer); |
(...skipping 12 matching lines...) Expand all Loading... | |
202 function(tree_impl->LayerById(id)); | 204 function(tree_impl->LayerById(id)); |
203 } | 205 } |
204 } | 206 } |
205 | 207 |
206 CC_EXPORT PropertyTrees* GetPropertyTrees(Layer* layer); | 208 CC_EXPORT PropertyTrees* GetPropertyTrees(Layer* layer); |
207 CC_EXPORT PropertyTrees* GetPropertyTrees(LayerImpl* layer); | 209 CC_EXPORT PropertyTrees* GetPropertyTrees(LayerImpl* layer); |
208 | 210 |
209 } // namespace cc | 211 } // namespace cc |
210 | 212 |
211 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_ | 213 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_ |
OLD | NEW |