cc: Move tiling management out of draw properties calculation.

cc/layers/picture_image_layer_impl.cc

Index: cc/layers/picture_image_layer_impl.cc
diff --git a/cc/layers/picture_image_layer_impl.cc b/cc/layers/picture_image_layer_impl.cc
index 62bab45108a9b9b53817abf5a628f70183e58e5f..f252bcb806a698e013de64d6187512f14391eb4e 100644
--- a/cc/layers/picture_image_layer_impl.cc
+++ b/cc/layers/picture_image_layer_impl.cc
@@ -27,28 +27,6 @@ scoped_ptr<LayerImpl> PictureImageLayerImpl::CreateLayerImpl(
   return PictureImageLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>();
 }
 
-void PictureImageLayerImpl::CalculateContentsScale(
-    float ideal_contents_scale,
-    float device_scale_factor,
-    float page_scale_factor,
-    float maximum_animation_contents_scale,
-    bool animating_transform_to_screen,
-    float* contents_scale_x,
-    float* contents_scale_y,
-    gfx::Size* content_bounds) {
-  // CalculateRasterContentsScale always returns 1.f, so make that the ideal
-  // scale.
-  ideal_contents_scale = 1.f;
-  PictureLayerImpl::CalculateContentsScale(ideal_contents_scale,
-                                           device_scale_factor,
-                                           page_scale_factor,
-                                           maximum_animation_contents_scale,
-                                           animating_transform_to_screen,
-                                           contents_scale_x,
-                                           contents_scale_y,
-                                           content_bounds);
-}
-
 void PictureImageLayerImpl::GetDebugBorderProperties(
     SkColor* color, float* width) const {
   *color = DebugColors::ImageLayerBorderColor();
@@ -74,4 +52,10 @@ void PictureImageLayerImpl::RecalculateRasterScales(
   low_res_raster_contents_scale_ = raster_contents_scale_;
 }
 
+void PictureImageLayerImpl::UpdateIdealScales() {
+  draw_properties().ideal_contents_scale = 1.f;

[enne (OOO), 2014/05/21 18:08:44]

In general cc tries not to update draw properties outside of
UpdateDrawProperties.  Can you do this differently? Maybe just set all the
ideal_foo_scale_ variables directly here?

Can you add a unit test that PictureImageLayerImpl always generates a
PictureLayerTiling with a scale of 1 regardless of what the page/device/contents
scales are? Such a test would have caught this regression.

+  // Defaults from PictureLayerImpl.
+  PictureLayerImpl::UpdateIdealScales();
+}
+
 }  // namespace cc