OLD | NEW |
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 <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "cc/base/math_util.h" | 10 #include "cc/base/math_util.h" |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 data_for_children->ancestor_clips_subtree = ancestor_clips_subtree; | 115 data_for_children->ancestor_clips_subtree = ancestor_clips_subtree; |
116 } | 116 } |
117 | 117 |
118 if (LayerClipsSubtree(layer)) | 118 if (LayerClipsSubtree(layer)) |
119 data_for_children->ancestor_clips_subtree = true; | 119 data_for_children->ancestor_clips_subtree = true; |
120 | 120 |
121 if (has_unclipped_surface) | 121 if (has_unclipped_surface) |
122 parent_id = 0; | 122 parent_id = 0; |
123 | 123 |
124 if (!RequiresClipNode(layer, data_from_ancestor, parent->data.transform_id, | 124 if (!RequiresClipNode(layer, data_from_ancestor, parent->data.transform_id, |
125 data_for_children->ancestor_clips_subtree)) { | 125 ancestor_clips_subtree)) { |
126 // Unclipped surfaces reset the clip rect. | 126 // Unclipped surfaces reset the clip rect. |
127 data_for_children->clip_tree_parent = parent_id; | 127 data_for_children->clip_tree_parent = parent_id; |
128 } else { | 128 } else { |
129 LayerType* transform_parent = data_for_children->transform_tree_parent; | 129 LayerType* transform_parent = data_for_children->transform_tree_parent; |
130 if (layer->position_constraint().is_fixed_position() && | 130 if (layer->position_constraint().is_fixed_position() && |
131 !created_transform_node) { | 131 !created_transform_node) { |
132 transform_parent = data_for_children->transform_fixed_parent; | 132 transform_parent = data_for_children->transform_fixed_parent; |
133 } | 133 } |
134 ClipNode node; | 134 ClipNode node; |
135 node.data.clip = gfx::RectF( | 135 node.data.clip = gfx::RectF( |
136 gfx::PointF() + layer->offset_to_transform_parent(), layer->bounds()); | 136 gfx::PointF() + layer->offset_to_transform_parent(), layer->bounds()); |
137 node.data.transform_id = transform_parent->transform_tree_index(); | 137 node.data.transform_id = transform_parent->transform_tree_index(); |
138 node.data.target_id = | 138 node.data.target_id = |
139 data_for_children->render_target->transform_tree_index(); | 139 data_for_children->render_target->transform_tree_index(); |
140 node.owner_id = layer->id(); | 140 node.owner_id = layer->id(); |
| 141 node.data.inherit_parent_target_space_clip = |
| 142 !data_for_children->ancestor_clips_subtree && |
| 143 layer->has_render_surface() && ancestor_clips_subtree; |
141 | 144 |
142 data_for_children->clip_tree_parent = | 145 data_for_children->clip_tree_parent = |
143 data_for_children->clip_tree->Insert(node, parent_id); | 146 data_for_children->clip_tree->Insert(node, parent_id); |
144 } | 147 } |
145 | 148 |
146 layer->SetClipTreeIndex( | 149 layer->SetClipTreeIndex( |
147 has_unclipped_surface ? 0 : data_for_children->clip_tree_parent); | 150 has_unclipped_surface ? 0 : data_for_children->clip_tree_parent); |
148 | 151 |
149 layer->set_is_clipped(data_for_children->ancestor_clips_subtree); | 152 layer->set_is_clipped(data_for_children->ancestor_clips_subtree); |
150 | 153 |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
500 const gfx::Rect& viewport, | 503 const gfx::Rect& viewport, |
501 const gfx::Transform& device_transform, | 504 const gfx::Transform& device_transform, |
502 PropertyTrees* property_trees) { | 505 PropertyTrees* property_trees) { |
503 BuildPropertyTreesTopLevelInternal( | 506 BuildPropertyTreesTopLevelInternal( |
504 root_layer, page_scale_layer, inner_viewport_scroll_layer, | 507 root_layer, page_scale_layer, inner_viewport_scroll_layer, |
505 outer_viewport_scroll_layer, page_scale_factor, device_scale_factor, | 508 outer_viewport_scroll_layer, page_scale_factor, device_scale_factor, |
506 viewport, device_transform, property_trees); | 509 viewport, device_transform, property_trees); |
507 } | 510 } |
508 | 511 |
509 } // namespace cc | 512 } // namespace cc |
OLD | NEW |