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

Unified Diff: cc/layers/layer_iterator_unittest.cc

Issue 1479883002: cc: Fix draw transform computation for non-drawn layers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove LayerImpl::draw_transform() Created 5 years, 1 month 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
Index: cc/layers/layer_iterator_unittest.cc
diff --git a/cc/layers/layer_iterator_unittest.cc b/cc/layers/layer_iterator_unittest.cc
index b7757670babf3e47d9109ec015378412dde31587..48a8635d35c9c187c84b0bbf04c33d241cb99d30 100644
--- a/cc/layers/layer_iterator_unittest.cc
+++ b/cc/layers/layer_iterator_unittest.cc
@@ -139,8 +139,10 @@ TEST_F(LayerIteratorTest, SimpleTree) {
host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
LayerImplList render_surface_layer_list;
+ host_impl_.active_tree()->IncrementRenderSurfaceListIdForTesting();
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
- root_ptr, root_ptr->bounds(), &render_surface_layer_list);
+ root_ptr, root_ptr->bounds(), &render_surface_layer_list,
+ host_impl_.active_tree()->current_render_surface_list_id());
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
IterateFrontToBack(&render_surface_layer_list);
@@ -185,8 +187,10 @@ TEST_F(LayerIteratorTest, ComplexTree) {
host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
LayerImplList render_surface_layer_list;
+ host_impl_.active_tree()->IncrementRenderSurfaceListIdForTesting();
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
- root_ptr, root_ptr->bounds(), &render_surface_layer_list);
+ root_ptr, root_ptr->bounds(), &render_surface_layer_list,
+ host_impl_.active_tree()->current_render_surface_list_id());
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
IterateFrontToBack(&render_surface_layer_list);
@@ -239,8 +243,10 @@ TEST_F(LayerIteratorTest, ComplexTreeMultiSurface) {
host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
LayerImplList render_surface_layer_list;
+ host_impl_.active_tree()->IncrementRenderSurfaceListIdForTesting();
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
- root_ptr, root_ptr->bounds(), &render_surface_layer_list);
+ root_ptr, root_ptr->bounds(), &render_surface_layer_list,
+ host_impl_.active_tree()->current_render_surface_list_id());
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
IterateFrontToBack(&render_surface_layer_list);

Powered by Google App Engine
This is Rietveld 408576698