Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(327)

Side by Side Diff: cc/trees/layer_tree_host_common.h

Issue 511253003: Made Blink aware of top controls offset (Chromium-side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed crash + mojo example build break Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/trees/layer_tree_host_client.h ('k') | cc/trees/layer_tree_host_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 float top_controls_delta;
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
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_
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_client.h ('k') | cc/trees/layer_tree_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698