cc: Refactor content scale/bounds into draw properties

cc/layer.h

 // Copyright 2010 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_H_
 #define CC_LAYER_H_
 
 #include <public/WebFilterOperations.h>
 #include <string>
 #include <vector>
@@ skipping 66 matching lines @@
 
     void setAnchorPointZ(float);
     float anchorPointZ() const { return m_anchorPointZ; }
 
     virtual void setBackgroundColor(SkColor);
     SkColor backgroundColor() const { return m_backgroundColor; }
 
     // A layer's bounds are in logical, non-page-scaled pixels (however, the
     // root layer's bounds are in physical pixels).
     void setBounds(const gfx::Size&);
+    // TODO(enne): remove this function: http://crbug.com/166023
+    virtual void didUpdateBounds();
     const gfx::Size& bounds() const { return m_bounds; }
-    virtual gfx::Size contentBounds() const;
 
     void setMasksToBounds(bool);
     bool masksToBounds() const { return m_masksToBounds; }
 
     void setMaskLayer(Layer*);
     Layer* maskLayer() { return m_maskLayer.get(); }
     const Layer* maskLayer() const { return m_maskLayer.get(); }
 
     virtual void setNeedsDisplayRect(const gfx::RectF& dirtyRect);
     void setNeedsDisplay() { setNeedsDisplayRect(gfx::RectF(gfx::PointF(), bounds())); }
@@ skipping 120 matching lines @@
     void setDebugName(const std::string&);
 
     virtual void pushPropertiesTo(LayerImpl*);
 
     void clearRenderSurface() { m_drawProperties.render_surface.reset(); }
     void createRenderSurface();
 
     // The contentsScale converts from logical, non-page-scaled pixels to target pixels.
     // The contentsScale is 1 for the root layer as it is already in physical pixels.
     // By default contentsScale is forced to be 1 except for subclasses of ContentsScalingLayer.
-    virtual float contentsScaleX() const;
-    virtual float contentsScaleY() const;
-    virtual void setContentsScale(float contentsScale) { }
+    float contentsScaleX() const { return m_drawProperties.contents_scale_x; }
+    float contentsScaleY() const { return m_drawProperties.contents_scale_y; }
+    gfx::Size contentBounds() const { return m_drawProperties.content_bounds; }
+    virtual void updateContentsScale(float ideal_contents_scale);
 
     // The scale at which contents should be rastered, to match the scale at
     // which they will drawn to the screen. This scale is a component of the
     // contentsScale() but does not include page/device scale factors.
     float rasterScale() const { return m_rasterScale; }
     void setRasterScale(float scale);
 
     // When true, the rasterScale() will be set by the compositor. If false, it
     // will use whatever value is given to it by the embedder.
     bool automaticallyComputeRasterScale() { return m_automaticallyComputeRasterScale; }
@@ skipping 61 matching lines @@
     // is not available and the update rect will remain empty.
     // Note this rect is in layer space (not content space).
     gfx::RectF m_updateRect;
 
     scoped_refptr<Layer> m_maskLayer;
 
     // Constructs a LayerImpl of the correct runtime type for this Layer type.
     virtual scoped_ptr<LayerImpl> createLayerImpl(LayerTreeImpl* treeImpl);
     int m_layerId;
 
+    DrawProperties<Layer, RenderSurface> m_drawProperties;

[danakj, 2012/12/14 20:37:23]

This can stay private I think.

If the subclass doesn't set this directly it doesn't need to access it, and
calcDraw and continue using it however it has been already.

+
 private:
     friend class base::RefCounted<Layer>;
 
     void setParent(Layer*);
     bool hasAncestor(Layer*) const;
     bool descendantIsFixedToContainerLayer() const;
 
     size_t numChildren() const { return m_children.size(); }
 
     // Returns the index of the child or -1 if not found.
@@ skipping 52 matching lines @@
 
     // Transient properties.
     float m_rasterScale;
     bool m_automaticallyComputeRasterScale;
     bool m_boundsContainPageScale;
 
     gfx::Transform m_implTransform;
 
     WebKit::WebAnimationDelegate* m_layerAnimationDelegate;
     WebKit::WebLayerScrollClient* m_layerScrollClient;
-
-    DrawProperties<Layer, RenderSurface> m_drawProperties;
 };
 
 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped_refptr<Layer> >::iterator, void*);
 
 }  // namespace cc
 
 #endif  // CC_LAYER_H_