cc: Move tiling management out of draw properties calculation.

cc/layers/picture_layer_impl.h

Index: cc/layers/picture_layer_impl.h
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
index afd96aa97dfd30467de5beb6f259b39ab928ec91..58dcd24efa080ff1c499c636c0f31a19fc1622e9 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -96,14 +96,6 @@ class CC_EXPORT PictureLayerImpl
   virtual void DidBecomeActive() OVERRIDE;
   virtual void DidBeginTracing() OVERRIDE;
   virtual void ReleaseResources() 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;
   virtual skia::RefPtr<SkPicture> GetPicture() OVERRIDE;
 
   // PictureLayerTilingClient overrides.
@@ -137,6 +129,8 @@ class CC_EXPORT PictureLayerImpl
   WhichTree GetTree() const;
   bool IsOnActiveOrPendingTree() const;
 
+  float MaximumTilingContentScale() const;
+
  protected:
   friend class LayerRasterTileIterator;
 
@@ -175,6 +169,13 @@ class CC_EXPORT PictureLayerImpl
   bool CanHaveTilingWithScale(float contents_scale) const;
   void SanityCheckTilingState() const;
 
+  virtual void UpdateIdealScales();
+  void PopulateSharedQuadStateWithOverrides(
+      SharedQuadState* state,
+      gfx::Transform target_space_transform,
+      gfx::Size content_bounds,
+      gfx::Rect visible_content_rect) const;
+
   virtual void GetDebugBorderProperties(
       SkColor* color, float* width) const OVERRIDE;
   virtual void AsValueInto(base::DictionaryValue* dict) const OVERRIDE;