| Index: cc/scrollbar_animation_controller.h
|
| diff --git a/cc/scrollbar_animation_controller.h b/cc/scrollbar_animation_controller.h
|
| index c26b4649ea95d28f179139c5ceb06c291e64e1fb..eaf291373f24c3c560acb6e0516b1a8358191ed1 100644
|
| --- a/cc/scrollbar_animation_controller.h
|
| +++ b/cc/scrollbar_animation_controller.h
|
| @@ -7,12 +7,9 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "cc/cc_export.h"
|
| -#include "FloatPoint.h"
|
| -#include "IntSize.h"
|
| -
|
| -namespace gfx {
|
| -class Size;
|
| -}
|
| +#include "ui/gfx/size.h"
|
| +#include "ui/gfx/vector2d.h"
|
| +#include "ui/gfx/vector2d_f.h"
|
|
|
| namespace cc {
|
|
|
| @@ -39,9 +36,9 @@ public:
|
| void setVerticalScrollbarLayer(ScrollbarLayerImpl* layer) { m_verticalScrollbarLayer = layer; }
|
| ScrollbarLayerImpl* verticalScrollbarLayer() const { return m_verticalScrollbarLayer; }
|
|
|
| - FloatPoint currentPos() const { return m_currentPos; }
|
| + gfx::Vector2dF currentOffset() const { return m_currentOffset; }
|
| gfx::Size totalSize() const { return m_totalSize; }
|
| - IntSize maximum() const { return m_maximum; }
|
| + gfx::Vector2d maximum() const { return m_maximum; }
|
|
|
| virtual void didPinchGestureBeginAtTime(double monotonicTime) { }
|
| virtual void didPinchGestureUpdateAtTime(double monotonicTime) { }
|
| @@ -58,9 +55,9 @@ private:
|
| ScrollbarLayerImpl* m_horizontalScrollbarLayer;
|
| ScrollbarLayerImpl* m_verticalScrollbarLayer;
|
|
|
| - FloatPoint m_currentPos;
|
| + gfx::Vector2dF m_currentOffset;
|
| gfx::Size m_totalSize;
|
| - IntSize m_maximum;
|
| + gfx::Vector2d m_maximum;
|
| };
|
|
|
| } // namespace cc
|
|
|