cc: Move tiling management out of draw properties calculation.

cc/layers/picture_image_layer_impl.h

Index: cc/layers/picture_image_layer_impl.h
diff --git a/cc/layers/picture_image_layer_impl.h b/cc/layers/picture_image_layer_impl.h
index 483d5f244b254ffae0c1fe4f4a763a81d6bf6584..be76d3dbd5fcc8773111bfea0f4fb6ebfc316f4f 100644
--- a/cc/layers/picture_image_layer_impl.h
+++ b/cc/layers/picture_image_layer_impl.h
@@ -21,14 +21,6 @@ class CC_EXPORT PictureImageLayerImpl : public PictureLayerImpl {
   virtual const char* LayerTypeAsString() const OVERRIDE;
   virtual scoped_ptr<LayerImpl> CreateLayerImpl(
       LayerTreeImpl* tree_impl) OVERRIDE;
-  virtual void 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) OVERRIDE;
 
  protected:
   PictureImageLayerImpl(LayerTreeImpl* tree_impl, int id);
@@ -41,6 +33,8 @@ class CC_EXPORT PictureImageLayerImpl : public PictureLayerImpl {
   virtual void GetDebugBorderProperties(
       SkColor* color, float* width) const OVERRIDE;
 
+  virtual void UpdateIdealScales();

[danakj, 2014/05/23 17:07:34]

OVERRIDE

+
  private:
   DISALLOW_COPY_AND_ASSIGN(PictureImageLayerImpl);
 };