Chromium Code Reviews| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 1212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1223 data_for_recursion.property_trees->scroll_tree.clear(); | 1223 data_for_recursion.property_trees->scroll_tree.clear(); |
| 1224 data_for_recursion.compound_transform_since_render_target = gfx::Transform(); | 1224 data_for_recursion.compound_transform_since_render_target = gfx::Transform(); |
| 1225 data_for_recursion.axis_align_since_render_target = true; | 1225 data_for_recursion.axis_align_since_render_target = true; |
| 1226 data_for_recursion.property_trees->transform_tree.set_device_scale_factor( | 1226 data_for_recursion.property_trees->transform_tree.set_device_scale_factor( |
| 1227 device_scale_factor); | 1227 device_scale_factor); |
| 1228 data_for_recursion.safe_opaque_background_color = color; | 1228 data_for_recursion.safe_opaque_background_color = color; |
| 1229 data_for_recursion.property_trees->transform_id_to_index_map.clear(); | 1229 data_for_recursion.property_trees->transform_id_to_index_map.clear(); |
| 1230 data_for_recursion.property_trees->effect_id_to_index_map.clear(); | 1230 data_for_recursion.property_trees->effect_id_to_index_map.clear(); |
| 1231 data_for_recursion.property_trees->clip_id_to_index_map.clear(); | 1231 data_for_recursion.property_trees->clip_id_to_index_map.clear(); |
| 1232 data_for_recursion.property_trees->scroll_id_to_index_map.clear(); | 1232 data_for_recursion.property_trees->scroll_id_to_index_map.clear(); |
| 1233 data_for_recursion.property_trees->always_use_active_tree_opacity_effect_ids | |
| 1234 .clear(); | |
|
jaydasika
2016/06/07 04:17:35
I think all clearing code should go into a single
| |
| 1233 | 1235 |
| 1234 ClipNode root_clip; | 1236 ClipNode root_clip; |
| 1235 root_clip.data.resets_clip = true; | 1237 root_clip.data.resets_clip = true; |
| 1236 root_clip.data.applies_local_clip = true; | 1238 root_clip.data.applies_local_clip = true; |
| 1237 root_clip.data.clip = gfx::RectF(viewport); | 1239 root_clip.data.clip = gfx::RectF(viewport); |
| 1238 root_clip.data.transform_id = kRootPropertyTreeNodeId; | 1240 root_clip.data.transform_id = kRootPropertyTreeNodeId; |
| 1239 data_for_recursion.clip_tree_parent = | 1241 data_for_recursion.clip_tree_parent = |
| 1240 data_for_recursion.property_trees->clip_tree.Insert( | 1242 data_for_recursion.property_trees->clip_tree.Insert( |
| 1241 root_clip, kRootPropertyTreeNodeId); | 1243 root_clip, kRootPropertyTreeNodeId); |
| 1242 | 1244 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1320 if (SkColorGetA(color) != 255) | 1322 if (SkColorGetA(color) != 255) |
| 1321 color = SkColorSetA(color, 255); | 1323 color = SkColorSetA(color, 255); |
| 1322 BuildPropertyTreesTopLevelInternal( | 1324 BuildPropertyTreesTopLevelInternal( |
| 1323 root_layer, page_scale_layer, inner_viewport_scroll_layer, | 1325 root_layer, page_scale_layer, inner_viewport_scroll_layer, |
| 1324 outer_viewport_scroll_layer, overscroll_elasticity_layer, | 1326 outer_viewport_scroll_layer, overscroll_elasticity_layer, |
| 1325 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, | 1327 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, |
| 1326 device_transform, property_trees, color); | 1328 device_transform, property_trees, color); |
| 1327 } | 1329 } |
| 1328 | 1330 |
| 1329 } // namespace cc | 1331 } // namespace cc |
| OLD | NEW |