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

Side by Side Diff: cc/trees/property_tree_builder.cc

Issue 2714043002: Store non-fast scrollable regions on ScrollNode (Closed)
Patch Set: Rebase from space Created 3 years, 9 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_impl.cc ('k') | cc/trees/scroll_node.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "cc/trees/property_tree_builder.h" 5 #include "cc/trees/property_tree_builder.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1145 matching lines...) Expand 10 before | Expand all | Expand 10 after
1156 1156
1157 int node_id; 1157 int node_id;
1158 if (!requires_node) { 1158 if (!requires_node) {
1159 node_id = parent_id; 1159 node_id = parent_id;
1160 data_for_children->scroll_tree_parent = node_id; 1160 data_for_children->scroll_tree_parent = node_id;
1161 } else { 1161 } else {
1162 ScrollNode node; 1162 ScrollNode node;
1163 node.owning_layer_id = layer->id(); 1163 node.owning_layer_id = layer->id();
1164 node.scrollable = scrollable; 1164 node.scrollable = scrollable;
1165 node.main_thread_scrolling_reasons = main_thread_scrolling_reasons; 1165 node.main_thread_scrolling_reasons = main_thread_scrolling_reasons;
1166 node.contains_non_fast_scrollable_region = 1166 node.non_fast_scrollable_region = layer->non_fast_scrollable_region();
1167 contains_non_fast_scrollable_region;
1168 gfx::Size clip_bounds; 1167 gfx::Size clip_bounds;
1169 if (layer->scroll_clip_layer()) { 1168 if (layer->scroll_clip_layer()) {
1170 clip_bounds = layer->scroll_clip_layer()->bounds(); 1169 clip_bounds = layer->scroll_clip_layer()->bounds();
1171 DCHECK(layer->scroll_clip_layer()->transform_tree_index() != 1170 DCHECK(layer->scroll_clip_layer()->transform_tree_index() !=
1172 TransformTree::kInvalidNodeId); 1171 TransformTree::kInvalidNodeId);
1173 node.max_scroll_offset_affected_by_page_scale = 1172 node.max_scroll_offset_affected_by_page_scale =
1174 !data_from_ancestor.property_trees->transform_tree 1173 !data_from_ancestor.property_trees->transform_tree
1175 .Node(layer->scroll_clip_layer()->transform_tree_index()) 1174 .Node(layer->scroll_clip_layer()->transform_tree_index())
1176 ->in_subtree_of_page_scale_layer && 1175 ->in_subtree_of_page_scale_layer &&
1177 data_from_ancestor.in_subtree_of_page_scale_layer; 1176 data_from_ancestor.in_subtree_of_page_scale_layer;
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
1548 root_layer, page_scale_layer, inner_viewport_scroll_layer, 1547 root_layer, page_scale_layer, inner_viewport_scroll_layer,
1549 outer_viewport_scroll_layer, overscroll_elasticity_layer, 1548 outer_viewport_scroll_layer, overscroll_elasticity_layer,
1550 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, 1549 elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
1551 device_transform, property_trees, color); 1550 device_transform, property_trees, color);
1552 property_trees->effect_tree.CreateOrReuseRenderSurfaces( 1551 property_trees->effect_tree.CreateOrReuseRenderSurfaces(
1553 &render_surfaces, root_layer->layer_tree_impl()); 1552 &render_surfaces, root_layer->layer_tree_impl());
1554 property_trees->ResetCachedData(); 1553 property_trees->ResetCachedData();
1555 } 1554 }
1556 1555
1557 } // namespace cc 1556 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/scroll_node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698