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

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

Issue 2571263002: cc: Remove map lookup from RenderSurfaceImpl::EffectTreeIndex (Closed)
Patch Set: Fix post-rebase unit test failure Created 3 years, 11 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/property_tree.cc ('k') | no next file » | 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 1358 matching lines...) Expand 10 before | Expand all | Expand 10 after
1369 property_trees, overscroll_elasticity_layer, elastic_overscroll); 1369 property_trees, overscroll_elasticity_layer, elastic_overscroll);
1370 property_trees->clip_tree.SetViewportClip(gfx::RectF(viewport)); 1370 property_trees->clip_tree.SetViewportClip(gfx::RectF(viewport));
1371 float page_scale_factor_for_root = 1371 float page_scale_factor_for_root =
1372 page_scale_layer == root_layer ? page_scale_factor : 1.f; 1372 page_scale_layer == root_layer ? page_scale_factor : 1.f;
1373 property_trees->transform_tree.SetRootTransformsAndScales( 1373 property_trees->transform_tree.SetRootTransformsAndScales(
1374 device_scale_factor, page_scale_factor_for_root, device_transform, 1374 device_scale_factor, page_scale_factor_for_root, device_transform,
1375 root_layer->position()); 1375 root_layer->position());
1376 return; 1376 return;
1377 } 1377 }
1378 1378
1379 property_trees->sequence_number++;
1380
1381 DataForRecursion<LayerType> data_for_recursion; 1379 DataForRecursion<LayerType> data_for_recursion;
1382 data_for_recursion.property_trees = property_trees; 1380 data_for_recursion.property_trees = property_trees;
1383 data_for_recursion.transform_tree_parent = nullptr; 1381 data_for_recursion.transform_tree_parent = nullptr;
1384 data_for_recursion.transform_fixed_parent = nullptr; 1382 data_for_recursion.transform_fixed_parent = nullptr;
1385 data_for_recursion.render_target = kRootPropertyTreeNodeId; 1383 data_for_recursion.render_target = kRootPropertyTreeNodeId;
1386 data_for_recursion.clip_tree_parent = kRootPropertyTreeNodeId; 1384 data_for_recursion.clip_tree_parent = kRootPropertyTreeNodeId;
1387 data_for_recursion.effect_tree_parent = kInvalidPropertyTreeNodeId; 1385 data_for_recursion.effect_tree_parent = kInvalidPropertyTreeNodeId;
1388 data_for_recursion.scroll_tree_parent = kRootPropertyTreeNodeId; 1386 data_for_recursion.scroll_tree_parent = kRootPropertyTreeNodeId;
1389 data_for_recursion.page_scale_layer = page_scale_layer; 1387 data_for_recursion.page_scale_layer = page_scale_layer;
1390 data_for_recursion.inner_viewport_scroll_layer = inner_viewport_scroll_layer; 1388 data_for_recursion.inner_viewport_scroll_layer = inner_viewport_scroll_layer;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
1504 color = SkColorSetA(color, 255); 1502 color = SkColorSetA(color, 255);
1505 BuildPropertyTreesTopLevelInternal( 1503 BuildPropertyTreesTopLevelInternal(
1506 root_layer, page_scale_layer, inner_viewport_scroll_layer, 1504 root_layer, page_scale_layer, inner_viewport_scroll_layer,
1507 outer_viewport_scroll_layer, overscroll_elasticity_layer, 1505 outer_viewport_scroll_layer, overscroll_elasticity_layer,
1508 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, 1506 elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
1509 device_transform, property_trees, color); 1507 device_transform, property_trees, color);
1510 property_trees->ResetCachedData(); 1508 property_trees->ResetCachedData();
1511 } 1509 }
1512 1510
1513 } // namespace cc 1511 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/property_tree.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698