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 fc0507c6edd936262ed8b87c7c42ef8bc8353d10..eda7188838f0a1d0b85fb16dae61200fd5580283 100644
--- a/cc/draw_properties.h
+++ b/cc/draw_properties.h
@@ -16,12 +16,15 @@ namespace cc {
 template<typename LayerType, typename RenderSurfaceType>
 struct CC_EXPORT DrawProperties {
     DrawProperties()
-        : opacity(0)
-        , opacity_is_animating(false)
-        , target_space_transform_is_animating(false)
-        , screen_space_transform_is_animating(false)
-        , is_clipped(false)
-        , render_target(0)
+        : opacity(0),
+          opacity_is_animating(false),
+          target_space_transform_is_animating(false),
+          screen_space_transform_is_animating(false),
+          is_clipped(false),
+          render_target(0),
+          ideal_contents_scale(1),
+          contents_scale_x(1),
+          contents_scale_y(1)
     {
     }
 
@@ -67,6 +70,11 @@ struct CC_EXPORT DrawProperties {
     // layer. This value is used to avoid unnecessarily changing GL scissor
     // state.
     gfx::Rect clip_rect;
+
+    float ideal_contents_scale;

[shawnsingh, 2012/12/11 21:54:05]

Conceptually, it seems like ideal_contents_scale is merely a temporary value
that is passed to setIdealContentsScale() for the purposes of computing
contents_scale_x and contents_scale_y.

If it's really needed for contents_scaling_layer and possibly image_layer,
perhaps we should make it a private variable unique to those classes, instead of
keeping it here.

[enne (OOO), 2012/12/11 23:23:44]

Ok, sure.  I can store it elsewhere.  I just thought it might be useful to store
here in one place since it was something that all layers calculated.

+    float contents_scale_x;
+    float contents_scale_y;
+    gfx::Size content_bounds;
 };
 
 }  // namespace cc