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

Unified Diff: cc/trees/property_tree_builder.cc

Issue 1544103002: Determine a layer's IsAffectedByPageScale property without using Layer Tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index 3a41a56d3320d51fd589abfa31e7aee30d87ee84..c94bfdc32de39da06c54299576be6fc29a0bd9a2 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -628,6 +628,10 @@ void BuildPropertyTreesInternal(
LayerType* layer,
const DataForRecursion<LayerType>& data_from_parent) {
layer->set_property_tree_sequence_number(data_from_parent.sequence_number);
+ if (layer->mask_layer())
+ layer->mask_layer()->set_property_tree_sequence_number(
+ data_from_parent.sequence_number);
+
DataForRecursion<LayerType> data_for_children(data_from_parent);
bool created_render_surface =
@@ -640,14 +644,14 @@ void BuildPropertyTreesInternal(
layer->set_draw_blend_mode(layer->blend_mode());
}
+ if (layer == data_from_parent.page_scale_layer)
+ data_for_children.in_subtree_of_page_scale_layer = true;
ajuma 2015/12/23 22:17:04 Nit: How about moving this inside AddTransformNode
+
bool created_transform_node = AddTransformNodeIfNeeded(
data_from_parent, layer, created_render_surface, &data_for_children);
AddClipNodeIfNeeded(data_from_parent, layer, created_render_surface,
created_transform_node, &data_for_children);
- if (layer == data_from_parent.page_scale_layer)
- data_for_children.in_subtree_of_page_scale_layer = true;
-
data_for_children.is_hidden =
layer->hide_layer_and_subtree() || data_from_parent.is_hidden;
layer->set_is_hidden_from_property_trees(data_for_children.is_hidden);
« cc/layers/heads_up_display_layer_impl_unittest.cc ('K') | « cc/layers/picture_layer_impl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698