cc: Use gfx:: Geometry types for positions, bounds, and related things.

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 CCLayerImpl_h
 #define CCLayerImpl_h
 
-#include "FloatRect.h"
-#include "IntRect.h"
 #include "Region.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/input_handler.h"
 #include "cc/layer_animation_controller.h"
 #include "cc/render_pass.h"
 #include "cc/render_surface_impl.h"
 #include "cc/resource_provider.h"
 #include "cc/scoped_ptr_vector.h"
 #include "cc/shared_quad_state.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/rect_f.h"
 #include <public/WebFilterOperations.h>
 #include <public/WebTransformationMatrix.h>
 #include <string>
 
 namespace cc {
 
 class LayerSorter;
 class LayerTreeHostImpl;
 class QuadSink;
 class Renderer;
@@ skipping 57 matching lines @@
     // Returns true if this layer has content to draw.
     void setDrawsContent(bool);
     bool drawsContent() const { return m_drawsContent; }
 
     bool forceRenderSurface() const { return m_forceRenderSurface; }
     void setForceRenderSurface(bool force) { m_forceRenderSurface = force; }
 
     // Returns true if any of the layer's descendants has content to draw.
     virtual bool descendantDrawsContent();
 
-    void setAnchorPoint(const FloatPoint&);
-    const FloatPoint& anchorPoint() const { return m_anchorPoint; }
+    void setAnchorPoint(const gfx::PointF&);
+    const gfx::PointF& anchorPoint() const { return m_anchorPoint; }
 
     void setAnchorPointZ(float);
     float anchorPointZ() const { return m_anchorPointZ; }
 
     void setBackgroundColor(SkColor);
     SkColor backgroundColor() const { return m_backgroundColor; }
 
     void setFilters(const WebKit::WebFilterOperations&);
     const WebKit::WebFilterOperations& filters() const { return m_filters; }
 
     void setBackgroundFilters(const WebKit::WebFilterOperations&);
     const WebKit::WebFilterOperations& backgroundFilters() const { return m_backgroundFilters; }
 
     void setFilter(SkImageFilter*);
     SkImageFilter* filter() const { return m_filter; }
 
     void setMasksToBounds(bool);
     bool masksToBounds() const { return m_masksToBounds; }
 
     void setContentsOpaque(bool);
     bool contentsOpaque() const { return m_contentsOpaque; }
 
     void setOpacity(float);
     bool opacityIsAnimating() const;
 
-    void setPosition(const FloatPoint&);
-    const FloatPoint& position() const { return m_position; }
+    void setPosition(const gfx::PointF&);
+    const gfx::PointF& position() const { return m_position; }
 
     void setIsContainerForFixedPositionLayers(bool isContainerForFixedPositionLayers) { m_isContainerForFixedPositionLayers = isContainerForFixedPositionLayers; }
     bool isContainerForFixedPositionLayers() const { return m_isContainerForFixedPositionLayers; }
 
     void setFixedToContainerLayer(bool fixedToContainerLayer = true) { m_fixedToContainerLayer = fixedToContainerLayer;}
     bool fixedToContainerLayer() const { return m_fixedToContainerLayer; }
 
     void setPreserves3D(bool);
     bool preserves3D() const { return m_preserves3D; }
 
@@ skipping 27 matching lines @@
     bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; }
     void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityIsAnimating = drawOpacityIsAnimating; }
 
     LayerImpl* renderTarget() const { DCHECK(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; }
     void setRenderTarget(LayerImpl* target) { m_renderTarget = target; }
 
     // 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 IntSize&);
-    const IntSize& bounds() const { return m_bounds; }
+    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 IntSize&);
-    IntSize contentBounds() const { return m_contentBounds; }
+    void setContentBounds(const gfx::Size&);
+    gfx::Size contentBounds() const { return m_contentBounds; }
 
     float contentsScaleX() const { return m_contentsScaleX; }
     float contentsScaleY() const { return m_contentsScaleY; }
     void setContentsScale(float contentsScaleX, float contentsScaleY);
 
     const IntPoint& scrollPosition() const { return m_scrollPosition; }
     void setScrollPosition(const IntPoint&);
 
     const IntSize& maxScrollPosition() const {return m_maxScrollPosition; }
     void setMaxScrollPosition(const IntSize&);
@@ skipping 20 matching lines @@
     void setHaveWheelEventHandlers(bool haveWheelEventHandlers) { m_haveWheelEventHandlers = haveWheelEventHandlers; }
 
     const Region& nonFastScrollableRegion() const { return m_nonFastScrollableRegion; }
     void setNonFastScrollableRegion(const Region& region) { m_nonFastScrollableRegion = region; }
 
     void setDrawCheckerboardForMissingTiles(bool checkerboard) { m_drawCheckerboardForMissingTiles = checkerboard; }
     bool drawCheckerboardForMissingTiles() const;
 
     InputHandlerClient::ScrollStatus tryScroll(const IntPoint& viewportPoint, InputHandlerClient::ScrollInputType) const;
 
-    const IntRect& visibleContentRect() const { return m_visibleContentRect; }
-    void setVisibleContentRect(const IntRect& visibleContentRect) { m_visibleContentRect = visibleContentRect; }
+    const gfx::Rect& visibleContentRect() const { return m_visibleContentRect; }
+    void setVisibleContentRect(const gfx::Rect& visibleContentRect) { m_visibleContentRect = visibleContentRect; }
 
     bool doubleSided() const { return m_doubleSided; }
     void setDoubleSided(bool);
 
     void setTransform(const WebKit::WebTransformationMatrix&);
     bool transformIsAnimating() const;
 
     const WebKit::WebTransformationMatrix& drawTransform() const { return m_drawTransform; }
     void setDrawTransform(const WebKit::WebTransformationMatrix& matrix) { m_drawTransform = matrix; }
     const WebKit::WebTransformationMatrix& screenSpaceTransform() const { return m_screenSpaceTransform; }
     void setScreenSpaceTransform(const WebKit::WebTransformationMatrix& matrix) { m_screenSpaceTransform = matrix; }
 
     bool drawTransformIsAnimating() const { return m_drawTransformIsAnimating; }
     void setDrawTransformIsAnimating(bool animating) { m_drawTransformIsAnimating = animating; }
     bool screenSpaceTransformIsAnimating() const { return m_screenSpaceTransformIsAnimating; }
     void setScreenSpaceTransformIsAnimating(bool animating) { m_screenSpaceTransformIsAnimating = animating; }
 
-    const IntRect& drawableContentRect() const { return m_drawableContentRect; }
-    void setDrawableContentRect(const IntRect& rect) { m_drawableContentRect = rect; }
-    const FloatRect& updateRect() const { return m_updateRect; }
-    void setUpdateRect(const FloatRect& updateRect) { m_updateRect = updateRect; }
+    const gfx::Rect& drawableContentRect() const { return m_drawableContentRect; }
+    void setDrawableContentRect(const gfx::Rect& rect) { m_drawableContentRect = rect; }
+    const gfx::RectF& updateRect() const { return m_updateRect; }
+    void setUpdateRect(const gfx::RectF& updateRect) { m_updateRect = updateRect; }
 
     std::string layerTreeAsText() const;
 
     void setStackingOrderChanged(bool);
 
     bool layerPropertyChanged() const { return m_layerPropertyChanged || layerIsAlwaysDamaged(); }
     bool layerSurfacePropertyChanged() const;
 
     void resetAllChangeTrackingForSubtree();
 
     virtual bool layerIsAlwaysDamaged() const;
 
     LayerAnimationController* layerAnimationController() { return m_layerAnimationController.get(); }
 
     virtual Region visibleContentOpaqueRegion() const;
 
     // Indicates that the context previously used to render this layer
     // was lost and that a new one has been created. Won't be called
     // until the new context has been created successfully.
     virtual void didLoseContext();
 
     ScrollbarAnimationController* scrollbarAnimationController() const { return m_scrollbarAnimationController.get(); }
 
     ScrollbarLayerImpl* horizontalScrollbarLayer() const;
     void setHorizontalScrollbarLayer(ScrollbarLayerImpl*);
 
     ScrollbarLayerImpl* verticalScrollbarLayer() const;
     void setVerticalScrollbarLayer(ScrollbarLayerImpl*);
 
-    IntRect layerRectToContentRect(const FloatRect& layerRect) const;
+    gfx::Rect layerRectToContentRect(const gfx::RectF& layerRect) const;
 
 protected:
     explicit LayerImpl(int);
 
     void appendDebugBorderQuad(QuadSink&, const SharedQuadState*, AppendQuadsData&) const;
 
     virtual void dumpLayerProperties(std::string*, int indent) const;
     static std::string indentString(int indent);
 
 private:
@@ skipping 15 matching lines @@
     ScopedPtrVector<LayerImpl> m_children;
     // m_maskLayer can be temporarily stolen during tree sync, we need this ID to confirm newly assigned layer is still the previous one
     int m_maskLayerId;
     scoped_ptr<LayerImpl> m_maskLayer;
     int m_replicaLayerId; // ditto
     scoped_ptr<LayerImpl> m_replicaLayer;
     int m_layerId;
     LayerTreeHostImpl* m_layerTreeHostImpl;
 
     // Properties synchronized from the associated Layer.
-    FloatPoint m_anchorPoint;
+    gfx::PointF m_anchorPoint;
     float m_anchorPointZ;
-    IntSize m_bounds;
-    IntSize m_contentBounds;
+    gfx::Size m_bounds;
+    gfx::Size m_contentBounds;
     float m_contentsScaleX;
     float m_contentsScaleY;
     IntPoint m_scrollPosition;
     bool m_scrollable;
     bool m_shouldScrollOnMainThread;
     bool m_haveWheelEventHandlers;
     Region m_nonFastScrollableRegion;
     SkColor m_backgroundColor;
 
     // Whether the "back" of this layer should draw.
     bool m_doubleSided;
 
     // Tracks if drawing-related properties have changed since last redraw.
     bool m_layerPropertyChanged;
 
     // Indicates that a property has changed on this layer that would not
     // affect the pixels on its target surface, but would require redrawing
     // but would require redrawing the targetSurface onto its ancestor targetSurface.
     // For layers that do not own a surface this flag acts as m_layerPropertyChanged.
     bool m_layerSurfacePropertyChanged;
 
     // Uses layer's content space.
-    IntRect m_visibleContentRect;
+    gfx::Rect m_visibleContentRect;
     bool m_masksToBounds;
     bool m_contentsOpaque;
     float m_opacity;
-    FloatPoint m_position;
+    gfx::PointF m_position;
     bool m_preserves3D;
     bool m_useParentBackfaceVisibility;
     bool m_drawCheckerboardForMissingTiles;
     WebKit::WebTransformationMatrix m_sublayerTransform;
     WebKit::WebTransformationMatrix m_transform;
     bool m_useLCDText;
 
     bool m_drawsContent;
     bool m_forceRenderSurface;
 
@@ skipping 37 matching lines @@
 #ifndef NDEBUG
     bool m_betweenWillDrawAndDidDraw;
 #endif
 
     // Render surface associated with this layer. The layer and its descendants
     // will render to this surface.
     scoped_ptr<RenderSurfaceImpl> m_renderSurface;
 
     // Hierarchical bounding rect containing the layer and its descendants.
     // Uses target surface's space.
-    IntRect m_drawableContentRect;
+    gfx::Rect m_drawableContentRect;
 
     // Rect indicating what was repainted/updated during update.
     // Note that plugin layers bypass this and leave it empty.
     // Uses layer's content space.
-    FloatRect m_updateRect;
+    gfx::RectF m_updateRect;
 
     // Manages animations for this layer.
     scoped_ptr<LayerAnimationController> m_layerAnimationController;
 
     // Manages scrollbars for this layer
     scoped_ptr<ScrollbarAnimationController> m_scrollbarAnimationController;
 };
 
 void sortLayers(std::vector<LayerImpl*>::iterator first, std::vector<LayerImpl*>::iterator end, LayerSorter*);
 
 }
 
 #endif // CCLayerImpl_h