cc: Remove all remaining use of WebCore Rect/Point/Size types from the compositor.

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 <string>
 
-#include "FloatSize.h"
-#include "IntPoint.h"
 #include "Region.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/cc_export.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"
@@ skipping 158 matching lines @@
 
     // 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; }
 
     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&);
+    gfx::Vector2d scrollOffset() const { return m_scrollOffset; }
+    void setScrollOffset(gfx::Vector2d);
 
-    const IntSize& maxScrollPosition() const {return m_maxScrollPosition; }
-    void setMaxScrollPosition(const IntSize&);
+    gfx::Vector2d maxScrollOffset() const {return m_maxScrollOffset; }
+    void setMaxScrollOffset(gfx::Vector2d);
 
-    const FloatSize& scrollDelta() const { return m_scrollDelta; }
-    void setScrollDelta(const FloatSize&);
+    const gfx::Vector2dF& scrollDelta() const { return m_scrollDelta; }
+    void setScrollDelta(const gfx::Vector2dF&);
 
     const WebKit::WebTransformationMatrix& implTransform() const { return m_implTransform; }
     void setImplTransform(const WebKit::WebTransformationMatrix& transform);
 
-    const IntSize& sentScrollDelta() const { return m_sentScrollDelta; }
-    void setSentScrollDelta(const IntSize& sentScrollDelta) { m_sentScrollDelta = sentScrollDelta; }
+    const gfx::Vector2d& sentScrollDelta() const { return m_sentScrollDelta; }
+    void setSentScrollDelta(const gfx::Vector2d& sentScrollDelta) { m_sentScrollDelta = sentScrollDelta; }
 
     // Returns the delta of the scroll that was outside of the bounds of the initial scroll
-    FloatSize scrollBy(const FloatSize& scroll);
+    gfx::Vector2dF scrollBy(const gfx::Vector2dF& scroll);
 
     bool scrollable() const { return m_scrollable; }
     void setScrollable(bool scrollable) { m_scrollable = scrollable; }
 
     bool shouldScrollOnMainThread() const { return m_shouldScrollOnMainThread; }
     void setShouldScrollOnMainThread(bool shouldScrollOnMainThread) { m_shouldScrollOnMainThread = shouldScrollOnMainThread; }
 
     bool haveWheelEventHandlers() const { return m_haveWheelEventHandlers; }
     void setHaveWheelEventHandlers(bool haveWheelEventHandlers) { m_haveWheelEventHandlers = haveWheelEventHandlers; }
 
@@ skipping 92 matching lines @@
     int m_layerId;
     LayerTreeHostImpl* m_layerTreeHostImpl;
 
     // 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;
-    IntPoint m_scrollPosition;
+    gfx::Vector2d m_scrollOffset;
     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.
@@ skipping 19 matching lines @@
     bool m_useLCDText;
 
     bool m_drawsContent;
     bool m_forceRenderSurface;
 
     // Set for the layer that other layers are fixed to.
     bool m_isContainerForFixedPositionLayers;
     // This is true if the layer should be fixed to the closest ancestor container.
     bool m_fixedToContainerLayer;
 
-    FloatSize m_scrollDelta;
-    IntSize m_sentScrollDelta;
-    IntSize m_maxScrollPosition;
+    gfx::Vector2dF m_scrollDelta;
+    gfx::Vector2d m_sentScrollDelta;
+    gfx::Vector2d m_maxScrollOffset;
     WebKit::WebTransformationMatrix m_implTransform;
 
     // The layer whose coordinate space this layer draws into. This can be
     // either the same layer (m_renderTarget == this) or an ancestor of this
     // layer.
     LayerImpl* m_renderTarget;
 
     // The global depth value of the center of the layer. This value is used
     // to sort layers from back to front.
     float m_drawDepth;
@@ skipping 40 matching lines @@
     scoped_ptr<ScrollbarAnimationController> m_scrollbarAnimationController;
 
     DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 void sortLayers(std::vector<LayerImpl*>::iterator first, std::vector<LayerImpl*>::iterator end, LayerSorter*);
 
 }
 
 #endif  // CC_LAYER_IMPL_H_