Index: cc/layer_impl.h |
diff --git a/cc/layer_impl.h b/cc/layer_impl.h |
index d51f3d0efcd0f05355fadae8c8b3e73c7d1173d2..c467d8224005fc90c8446c4743c1f2277da0b9db 100644 |
--- a/cc/layer_impl.h |
+++ b/cc/layer_impl.h |
@@ -7,8 +7,6 @@ |
#include <string> |
-#include "FloatSize.h" |
-#include "IntPoint.h" |
#include "Region.h" |
#include "base/logging.h" |
#include "base/memory/scoped_ptr.h" |
@@ -187,23 +185,23 @@ public: |
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; } |
@@ -316,7 +314,7 @@ private: |
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; |
@@ -356,9 +354,9 @@ private: |
// 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 |