cc: Refactor content scale/bounds into draw properties

cc/layer_impl.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_LAYER_IMPL_H_
 #define CC_LAYER_IMPL_H_
 
 #include <public/WebFilterOperations.h>
 #include <string>
 
@@ skipping 172 matching lines @@
     const LayerImpl* renderTarget() const { DCHECK(!m_drawProperties.render_target || m_drawProperties.render_target->renderSurface()); return m_drawProperties.render_target; }
     RenderSurfaceImpl* renderSurface() const { return m_drawProperties.render_surface.get(); }
 
     // The client should be responsible for setting bounds, contentBounds and
     // contentsScale to appropriate values. LayerImpl doesn't calculate any of
     // them from the other values.
 
     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);
 
     gfx::Vector2d scrollOffset() const { return m_scrollOffset; }
     void setScrollOffset(gfx::Vector2d);
 
     gfx::Vector2d maxScrollOffset() const {return m_maxScrollOffset; }
     void setMaxScrollOffset(gfx::Vector2d);
 
     const gfx::Vector2dF& scrollDelta() const { return m_scrollDelta; }
     void setScrollDelta(const gfx::Vector2dF&);
@@ skipping 109 matching lines @@
     scoped_ptr<LayerImpl> m_maskLayer;
     int m_replicaLayerId; // ditto
     scoped_ptr<LayerImpl> m_replicaLayer;
     int m_layerId;
     LayerTreeImpl* m_layerTreeImpl;
 
     // Properties synchronized from the associated Layer.
     gfx::PointF m_anchorPoint;
     float m_anchorPointZ;
     gfx::Size m_bounds;
-    gfx::Size m_contentBounds;
-    float m_contentsScaleX;
-    float m_contentsScaleY;
     gfx::Vector2d m_scrollOffset;
     bool m_scrollable;
     bool m_shouldScrollOnMainThread;
     bool m_haveWheelEventHandlers;
     Region m_nonFastScrollableRegion;
     Region m_touchEventHandlerRegion;
     SkColor m_backgroundColor;
 
     // Whether the "back" of this layer should draw.
     bool m_doubleSided;
@@ skipping 59 matching lines @@
     // Group of properties that need to be computed based on the layer tree
     // hierarchy before layers can be drawn.
     DrawProperties<LayerImpl, RenderSurfaceImpl> m_drawProperties;
 
     DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }
 
 #endif  // CC_LAYER_IMPL_H_