cc: Refactor content scale/bounds into draw properties

cc/draw_properties.h

Index: cc/draw_properties.h
diff --git a/cc/draw_properties.h b/cc/draw_properties.h
index 3895ef0720ab675044c7f7f9d63142261ac8e3ed..e5bf8136ed2f498c0acb31725bac4d1b8c452782 100644
--- a/cc/draw_properties.h
+++ b/cc/draw_properties.h
@@ -24,6 +24,8 @@ struct CC_EXPORT DrawProperties {
         , can_use_lcd_text(false)
         , is_clipped(false)
         , render_target(0)
+        , contents_scale_x(1)
+        , contents_scale_y(1)
         , num_descendants_that_draw_content(0)
     {
     }
@@ -75,6 +77,14 @@ struct CC_EXPORT DrawProperties {
     // state.
     gfx::Rect clip_rect;
 
+    // The scale used to move between layer space and content space, and bounds
+    // of the space. One is always a function of the other, but which one
+    // depends on the layer type. For picture layers, this is an ideal scale,
+    // and not always the one used.
+    float contents_scale_x;
+    float contents_scale_y;
+    gfx::Size content_bounds;
+
     // Does not include this layer itself, only its children and descendants.
     int num_descendants_that_draw_content;
 };