Revert of 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 d46ff8d975e9988618eb11a1a743d803a778a639..62bab45108a9b9b53817abf5a628f70183e58e5f 100644
--- a/cc/layers/picture_image_layer_impl.cc
+++ b/cc/layers/picture_image_layer_impl.cc
@@ -27,6 +27,28 @@
   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();
@@ -52,11 +74,4 @@
   low_res_raster_contents_scale_ = raster_contents_scale_;
 }
 
-void PictureImageLayerImpl::UpdateIdealScales() {
-  ideal_contents_scale_ = 1.f;
-  ideal_page_scale_ = 1.f;
-  ideal_device_scale_ = 1.f;
-  ideal_source_scale_ = 1.f;
-}
-
 }  // namespace cc