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

Unified Diff: cc/trees/layer_tree_host_common.cc

Issue 1801853002: Transfer LayerImpl ownership to LayerTreeImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more asan. Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host_common.h ('k') | cc/trees/layer_tree_host_common_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_common.cc
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index 83c9c7586f3f5ce2e4790fa9bba1b8f14de862c3..77b327b59b16814ecb6a4f7edc788ab83cb267f8 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -824,23 +824,23 @@ void CalculateRenderSurfaceLayerList(
if (render_to_separate_surface)
layer->render_surface()->SetAccumulatedContentRect(gfx::Rect());
- for (const auto& child_layer : layer->children()) {
+ for (auto* child_layer : layer->children()) {
CalculateRenderSurfaceLayerList(
- child_layer.get(), property_trees, render_surface_layer_list,
- descendants, nearest_occlusion_immune_ancestor, layer_is_drawn,
+ child_layer, property_trees, render_surface_layer_list, descendants,
+ nearest_occlusion_immune_ancestor, layer_is_drawn,
can_render_to_separate_surface, current_render_surface_layer_list_id,
max_texture_size);
// If the child is its own render target, then it has a render surface.
- if (child_layer->render_target() == child_layer.get() &&
+ if (child_layer->render_target() == child_layer &&
!child_layer->render_surface()->layer_list().empty() &&
!child_layer->render_surface()->content_rect().IsEmpty()) {
// This child will contribute its render surface, which means
// we need to mark just the mask layer (and replica mask layer)
// with the id.
MarkMasksWithRenderSurfaceLayerListId(
- child_layer.get(), current_render_surface_layer_list_id);
- descendants->push_back(child_layer.get());
+ child_layer, current_render_surface_layer_list_id);
+ descendants->push_back(child_layer);
}
if (child_layer->layer_or_descendant_is_drawn()) {
« no previous file with comments | « cc/trees/layer_tree_host_common.h ('k') | cc/trees/layer_tree_host_common_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698