Moving RenderSurface creation outside of CalcDrawProps

cc/layers/tiled_layer_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/tiled_layer.h"
 
 #include <limits>
 #include <vector>
 
 #include "base/run_loop.h"
@@ skipping 860 matching lines @@
   gfx::Rect content_bounds(0, 0, 200, 250);
 
   layer->SetBounds(layer_bounds.size());
   layer->SetContentBounds(content_bounds.size());
   layer->draw_properties().visible_content_rect = content_bounds;
 
   // On first update, the update_rect includes all tiles, even beyond the
   // 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 visible_content_rect we set above? If not can you
remove that, and EXPECT_EQ it after this instead?

[awoloszyn, 2014/09/09 15:31:36]

I removed this (and the others) and correctly created the render_surface
elsewhere.

 
   layer->SetTexturePriorities(priority_calculator_);
   resource_manager_->PrioritizeTextures();
   layer->SavePaintProperties();
   layer->Update(queue_.get(), NULL);
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 0, 300, 300 * 0.8), layer->update_rect());
   UpdateTextures();
 
   // After the tiles are updated once, another invalidate only needs to update
   // the bounds of the layer.
@@ skipping 853 matching lines @@
   TrackingLayerPainter* tracking_layer_painter_;
   scoped_refptr<BitmapContentLayerUpdater> layer_updater_;
   FakeRenderingStatsInstrumentation stats_instrumentation_;
 };
 
 TEST_F(TiledLayerTest, NonIntegerContentsScaleIsNotDistortedDuringPaint) {
   scoped_refptr<UpdateTrackingTiledLayer> layer =
       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 bounds etc? What is the point of
this call then?

[awoloszyn, 2014/09/09 15:31:36]

Done.

 
   gfx::Rect layer_rect(0, 0, 30, 31);
   layer->SetPosition(layer_rect.origin());
   layer->SetBounds(layer_rect.size());
   layer->UpdateContentsScale(1.5f);
 
   gfx::Rect content_rect(0, 0, 45, 47);
   EXPECT_EQ(content_rect.size(), layer->content_bounds());
   layer->draw_properties().visible_content_rect = content_rect;
   layer->draw_properties().drawable_content_rect = content_rect;
@@ skipping 25 matching lines @@
   layer_tree_host_->root_layer()->AddChild(layer);
 
   gfx::Rect layer_rect(0, 0, 30, 31);
   layer->SetPosition(layer_rect.origin());
   layer->SetBounds(layer_rect.size());
   layer->UpdateContentsScale(1.3f);
 
   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 above.

[awoloszyn, 2014/09/09 15:31:36]

Done.

 
   layer->SetTexturePriorities(priority_calculator_);
   resource_manager_->PrioritizeTextures();
   layer->SavePaintProperties();
 
   // Update the whole tile.
   layer->Update(queue_.get(), NULL);
   layer->tracking_layer_painter()->ResetPaintedRect();
 
   EXPECT_RECT_EQ(gfx::Rect(), layer->tracking_layer_painter()->PaintedRect());
   UpdateTextures();
 
   // Invalidate the entire layer in layer space. When painting, the rect given
   // to webkit should match the layer's bounds.
   layer->SetNeedsDisplayRect(layer_rect);
   layer->Update(queue_.get(), NULL);
 
   EXPECT_RECT_EQ(layer_rect, layer->tracking_layer_painter()->PaintedRect());
 }
 
 }  // namespace
 }  // namespace cc