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

Unified Diff: cc/trees/damage_tracker_unittest.cc

Issue 1823833002: cc : Update render surfaces using LayerListIterator instead of treewalk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ASAN unittest crashes 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/test/layer_tree_host_common_test.cc ('k') | cc/trees/draw_property_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/damage_tracker_unittest.cc
diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc
index 4dd597d0a9d06fbab1c01d241858d8f7081f764e..743631f2bca1c67b190a74c7cc34cb1979a58048 100644
--- a/cc/trees/damage_tracker_unittest.cc
+++ b/cc/trees/damage_tracker_unittest.cc
@@ -1465,12 +1465,14 @@ TEST_F(DamageTrackerTest, VerifyDamageForEmptyLayerList) {
scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl_.active_tree(), 1);
root->SetForceRenderSurface(true);
- root->layer_tree_impl()->property_trees()->needs_rebuild = true;
- EmulateDrawingOneFrame(root.get());
- root->draw_properties().render_target = root.get();
-
- ASSERT_EQ(root.get(), root->render_target());
- RenderSurfaceImpl* target_surface = root->render_surface();
+ host_impl_.active_tree()->SetRootLayer(std::move(root));
+ LayerImpl* root_ptr = host_impl_.active_tree()->root_layer();
+ root_ptr->layer_tree_impl()->property_trees()->needs_rebuild = true;
+ EmulateDrawingOneFrame(root_ptr);
+ root_ptr->draw_properties().render_target = root_ptr;
+
+ ASSERT_EQ(root_ptr, root_ptr->render_target());
+ RenderSurfaceImpl* target_surface = root_ptr->render_surface();
LayerImplList empty_list;
target_surface->damage_tracker()->UpdateDamageTrackingState(
« no previous file with comments | « cc/test/layer_tree_host_common_test.cc ('k') | cc/trees/draw_property_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698