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 80d09dde721ad2e533c11d819f4241e986c6327c..314ec7f15249257273bb08ea651420c3caede3a0 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -97,14 +97,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.
@@ -142,6 +134,8 @@ class CC_EXPORT PictureLayerImpl
   WhichTree GetTree() const;
   bool IsOnActiveOrPendingTree() const;
 
+  float MaximumTilingContentScale() const;
+
  protected:
   friend class LayerRasterTileIterator;
 
@@ -183,6 +177,8 @@ class CC_EXPORT PictureLayerImpl
   bool CanHaveTilingWithScale(float contents_scale) const;
   void SanityCheckTilingState() const;
 
+  void CalculateIdealScales();
+
   virtual void GetDebugBorderProperties(
       SkColor* color, float* width) const OVERRIDE;
   virtual void AsValueInto(base::DictionaryValue* dict) const OVERRIDE;
@@ -210,9 +206,6 @@ class CC_EXPORT PictureLayerImpl
   bool was_animating_transform_to_screen_;
   bool is_using_lcd_text_;
   bool needs_post_commit_initialization_;
-  // A sanity state check to make sure UpdateTilePriorities only gets called
-  // after a CalculateContentsScale/ManageTilings.
-  bool should_update_tile_priorities_;
   bool should_use_low_res_tiling_;
 
   bool layer_needs_to_register_itself_;