cc: Refactor content scale/bounds into draw properties

cc/image_layer.h

Index: cc/image_layer.h
diff --git a/cc/image_layer.h b/cc/image_layer.h
index f4f6cd7c2d88067acd71a7800ea01df585f94a6f..86d0dac629df95ed9a13d0d62dc4d2cfe8aea3a9 100644
--- a/cc/image_layer.h
+++ b/cc/image_layer.h
@@ -21,8 +21,11 @@ public:
     virtual bool drawsContent() const OVERRIDE;
     virtual void setTexturePriorities(const PriorityCalculator&) OVERRIDE;
     virtual void update(ResourceUpdateQueue&, const OcclusionTracker*, RenderingStats&) OVERRIDE;
-    virtual float contentsScaleX() const OVERRIDE;
-    virtual float contentsScaleY() const OVERRIDE;
+    virtual void calculateContentsScale(
+        float idealContentsScale,
+        float* contentsScaleX,
+        float* contentsScaleY,
+        gfx::Size* contentBounds) OVERRIDE;
 
     void setBitmap(const SkBitmap& image);
 
@@ -34,7 +37,8 @@ private:
 
     virtual LayerUpdater* updater() const OVERRIDE;
     virtual void createUpdaterIfNeeded() OVERRIDE;
-    virtual gfx::Size contentBounds() const OVERRIDE;
+    float imageContentsScaleX() const;
+    float imageContentsScaleY() const;
 
     SkBitmap m_bitmap;