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 <limits> | 8 #include <limits> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
133 gfx::Vector2d scroll_delta; | 133 gfx::Vector2d scroll_delta; |
134 }; | 134 }; |
135 }; | 135 }; |
136 | 136 |
137 struct CC_EXPORT ScrollAndScaleSet { | 137 struct CC_EXPORT ScrollAndScaleSet { |
138 ScrollAndScaleSet(); | 138 ScrollAndScaleSet(); |
139 ~ScrollAndScaleSet(); | 139 ~ScrollAndScaleSet(); |
140 | 140 |
141 std::vector<LayerTreeHostCommon::ScrollUpdateInfo> scrolls; | 141 std::vector<LayerTreeHostCommon::ScrollUpdateInfo> scrolls; |
142 float page_scale_delta; | 142 float page_scale_delta; |
143 int top_controls_content_offset; | |
aelias_OOO_until_Jul13
2014/08/29 04:37:01
scrolls and page scale updates in this struct are
bokan
2014/08/29 18:02:14
Yup, though I think the value that gets sent to Bl
bokan
2014/09/02 18:57:16
Just realized doing this has the same problem with
| |
143 ScopedPtrVector<SwapPromise> swap_promises; | 144 ScopedPtrVector<SwapPromise> swap_promises; |
144 }; | 145 }; |
145 | 146 |
146 template <typename LayerType> | 147 template <typename LayerType> |
147 bool LayerTreeHostCommon::RenderSurfaceContributesToTarget( | 148 bool LayerTreeHostCommon::RenderSurfaceContributesToTarget( |
148 LayerType* layer, | 149 LayerType* layer, |
149 int target_surface_layer_id) { | 150 int target_surface_layer_id) { |
150 // A layer will either contribute its own content, or its render surface's | 151 // A layer will either contribute its own content, or its render surface's |
151 // content, to the target surface. The layer contributes its surface's content | 152 // content, to the target surface. The layer contributes its surface's content |
152 // when both the following are true: | 153 // when both the following are true: |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
247 false, | 248 false, |
248 render_surface_layer_list, | 249 render_surface_layer_list, |
249 0) { | 250 0) { |
250 DCHECK(root_layer); | 251 DCHECK(root_layer); |
251 DCHECK(render_surface_layer_list); | 252 DCHECK(render_surface_layer_list); |
252 } | 253 } |
253 | 254 |
254 } // namespace cc | 255 } // namespace cc |
255 | 256 |
256 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_ | 257 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_ |
OLD | NEW |