cc/layers/tiled_layer_unittest.cc - Issue 465853004: Moving RenderSurface creation outside of CalcDrawProps

Unified Diff: cc/layers/tiled_layer_unittest.cc

Issue 465853004: Moving RenderSurface creation outside of CalcDrawProps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 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

« cc/layers/picture_layer_impl_unittest.cc ('K') | « cc/layers/tiled_layer_impl_unittest.cc ('k') | cc/layers/ui_resource_layer_impl_unittest.cc » ('j') | cc/test/layer_tree_host_common_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/layers/tiled_layer_unittest.cc

diff --git a/cc/layers/tiled_layer_unittest.cc b/cc/layers/tiled_layer_unittest.cc

index a52a5c7051f2f3f208222da561f6a69083a996f2..70d8bb349ea8489e84b2406731461a377b775db2 100644

--- a/cc/layers/tiled_layer_unittest.cc

+++ b/cc/layers/tiled_layer_unittest.cc

@@ -878,6 +878,8 @@ TEST_F(TiledLayerTest, VerifyUpdateRectWhenContentBoundsAreScaled) {

// boundaries of the layer.

// However, it should still be in layer space, not content space.

layer->InvalidateContentRect(content_bounds);

+ RenderSurfaceLayerList list;

+ CalcDrawProps(&list);

danakj 2014/09/03 19:30:33 Why do you need this? Doesn't this clobber the vi

awoloszyn 2014/09/09 15:31:36 I removed this (and the others) and correctly crea

layer->SetTexturePriorities(priority_calculator_);

resource_manager_->PrioritizeTextures();

@@ -1751,6 +1753,8 @@ TEST_F(TiledLayerTest, NonIntegerContentsScaleIsNotDistortedDuringPaint) {

make_scoped_refptr(new UpdateTrackingTiledLayer(resource_manager_.get()));

layer_tree_host_->root_layer()->AddChild(layer);

+ RenderSurfaceLayerList list;

+ CalcDrawProps(&list);

danakj 2014/09/03 19:30:33 Shouldn't this happen after we set the layer bound

awoloszyn 2014/09/09 15:31:36 Done.

gfx::Rect layer_rect(0, 0, 30, 31);

layer->SetPosition(layer_rect.origin());

@@ -1796,6 +1800,8 @@ TEST_F(TiledLayerTest,

gfx::Rect content_rect(layer->content_bounds());

layer->draw_properties().visible_content_rect = content_rect;

layer->draw_properties().drawable_content_rect = content_rect;

+ RenderSurfaceLayerList list;

+ CalcDrawProps(&list);

danakj 2014/09/03 19:30:33 Similar question re clobbering the draw_props set

awoloszyn 2014/09/09 15:31:36 Done.

layer->SetTexturePriorities(priority_calculator_);

resource_manager_->PrioritizeTextures();