cc: Refactor content scale/bounds into draw properties

cc/layer_impl.h

Index: cc/layer_impl.h
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index cb90958e117cb373f27bf4e197008d5aee48fbf1..aea3aabf9e41e0fc2b71d544cbaf034cd3e25937 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -194,14 +194,13 @@ public:
     void setBounds(const gfx::Size&);
     const gfx::Size& bounds() const { return m_bounds; }
 
-    // ContentBounds may be [0, 1) pixels larger than bounds * contentsScale.
-    // Don't calculate scale from it. Use contentsScale instead for accuracy.
     void setContentBounds(const gfx::Size&);
-    gfx::Size contentBounds() const { return m_contentBounds; }
+    gfx::Size contentBounds() const { return m_drawProperties.content_bounds; }
 
-    float contentsScaleX() const { return m_contentsScaleX; }
-    float contentsScaleY() const { return m_contentsScaleY; }
+    float contentsScaleX() const { return m_drawProperties.contents_scale_x; }
+    float contentsScaleY() const { return m_drawProperties.contents_scale_y; }
     void setContentsScale(float contentsScaleX, float contentsScaleY);
+    virtual void setIdealContentsScale(float ideal_contents_scale) { }
 
     gfx::Vector2d scrollOffset() const { return m_scrollOffset; }
     void setScrollOffset(gfx::Vector2d);