Index: cc/layer.h |
diff --git a/cc/layer.h b/cc/layer.h |
index d827ed4e37ddc963b8ab0407662ef7ad3ddbd477..3375b657830d0a4dbce701df656de9c2c44f2de0 100644 |
--- a/cc/layer.h |
+++ b/cc/layer.h |
@@ -5,7 +5,6 @@ |
#ifndef CC_LAYER_H_ |
#define CC_LAYER_H_ |
-#include "IntPoint.h" |
#include "Region.h" |
#include "base/memory/ref_counted.h" |
#include "cc/cc_export.h" |
@@ -129,11 +128,11 @@ public: |
const gfx::Rect& visibleContentRect() const { return m_visibleContentRect; } |
void setVisibleContentRect(const gfx::Rect& visibleContentRect) { m_visibleContentRect = visibleContentRect; } |
- void setScrollPosition(const IntPoint&); |
- const IntPoint& scrollPosition() const { return m_scrollPosition; } |
+ void setScrollOffset(gfx::Vector2d); |
+ gfx::Vector2d scrollOffset() const { return m_scrollOffset; } |
- void setMaxScrollPosition(const IntSize&); |
- const IntSize& maxScrollPosition() const { return m_maxScrollPosition; } |
+ void setMaxScrollOffset(gfx::Vector2d); |
+ gfx::Vector2d maxScrollOffset() const { return m_maxScrollOffset; } |
void setScrollable(bool); |
bool scrollable() const { return m_scrollable; } |
@@ -156,7 +155,7 @@ public: |
bool forceRenderSurface() const { return m_forceRenderSurface; } |
void setForceRenderSurface(bool); |
- IntSize scrollDelta() const { return IntSize(); } |
+ gfx::Vector2d scrollDelta() const { return gfx::Vector2d(); } |
void setImplTransform(const WebKit::WebTransformationMatrix&); |
const WebKit::WebTransformationMatrix& implTransform() const { return m_implTransform; } |
@@ -344,8 +343,8 @@ private: |
// Uses layer's content space. |
gfx::Rect m_visibleContentRect; |
- IntPoint m_scrollPosition; |
- IntSize m_maxScrollPosition; |
+ gfx::Vector2d m_scrollOffset; |
+ gfx::Vector2d m_maxScrollOffset; |
bool m_scrollable; |
bool m_shouldScrollOnMainThread; |
bool m_haveWheelEventHandlers; |