Use float for scroll offset.

third_party/WebKit/Source/platform/scroll/Scrollbar.cpp

Index: third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
index b148817a83bf4f84cee057128801400383e3404e..f87df9258a4598d79f5c2c2d3701c94cc4206015 100644
--- a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
+++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
@@ -253,15 +253,15 @@ void Scrollbar::moveThumb(int pos, bool draggingDocument) {
     if (m_draggingDocument)
       delta = pos - m_documentDragPos;
     m_draggingDocument = true;
-    FloatPoint currentPosition =
-        m_scrollableArea->scrollAnimator().currentPosition();
+    ScrollOffset currentPosition =
+        m_scrollableArea->scrollAnimator().currentOffset();
     float destinationPosition =
-        (m_orientation == HorizontalScrollbar ? currentPosition.x()
-                                              : currentPosition.y()) +
+        (m_orientation == HorizontalScrollbar ? currentPosition.width()
+                                              : currentPosition.height()) +
         delta;
-    destinationPosition = m_scrollableArea->clampScrollPosition(
-        m_orientation, destinationPosition);
-    m_scrollableArea->setScrollPositionSingleAxis(
+    destinationPosition =
+        m_scrollableArea->clampScrollOffset(m_orientation, destinationPosition);
+    m_scrollableArea->setScrollOffsetSingleAxis(
         m_orientation, destinationPosition, UserScroll);
     m_documentDragPos = pos;
     return;
@@ -285,14 +285,14 @@ void Scrollbar::moveThumb(int pos, bool draggingDocument) {
   else if (delta < 0)
     delta = std::max(-thumbPos, delta);
 
-  float minPos = m_scrollableArea->minimumScrollPosition(m_orientation);
-  float maxPos = m_scrollableArea->maximumScrollPosition(m_orientation);
+  float minOffset = m_scrollableArea->minimumScrollOffset(m_orientation);
+  float maxOffset = m_scrollableArea->maximumScrollOffset(m_orientation);
   if (delta) {
-    float newPosition = static_cast<float>(thumbPos + delta) *
-                            (maxPos - minPos) / (trackLen - thumbLen) +
-                        minPos;
-    m_scrollableArea->setScrollPositionSingleAxis(m_orientation, newPosition,
-                                                  UserScroll);
+    float newOffset = static_cast<float>(thumbPos + delta) *
+                          (maxOffset - minOffset) / (trackLen - thumbLen) +
+                      minOffset;
+    m_scrollableArea->setScrollOffsetSingleAxis(m_orientation, newOffset,
+                                                UserScroll);
   }
 }
 
@@ -409,10 +409,9 @@ void Scrollbar::mouseMoved(const PlatformMouseEvent& evt) {
   if (m_pressedPart == ThumbPart) {
     if (theme().shouldSnapBackToDragOrigin(*this, evt)) {
       if (m_scrollableArea) {
-        m_scrollableArea->setScrollPositionSingleAxis(
+        m_scrollableArea->setScrollOffsetSingleAxis(
             m_orientation,
-            m_dragOrigin +
-                m_scrollableArea->minimumScrollPosition(m_orientation),
+            m_dragOrigin + m_scrollableArea->minimumScrollOffset(m_orientation),
             UserScroll);
       }
     } else {
@@ -583,24 +582,26 @@ float Scrollbar::scrollableAreaCurrentPos() const {
   if (!m_scrollableArea)
     return 0;
 
-  if (m_orientation == HorizontalScrollbar)
-    return m_scrollableArea->scrollPosition().x() -
-           m_scrollableArea->minimumScrollPosition().x();
+  if (m_orientation == HorizontalScrollbar) {
+    return m_scrollableArea->scrollOffset().width() -
+           m_scrollableArea->minimumScrollOffset().width();
+  }
 
-  return m_scrollableArea->scrollPosition().y() -
-         m_scrollableArea->minimumScrollPosition().y();
+  return m_scrollableArea->scrollOffset().height() -
+         m_scrollableArea->minimumScrollOffset().height();
 }
 
 float Scrollbar::scrollableAreaTargetPos() const {
   if (!m_scrollableArea)
     return 0;
 
-  if (m_orientation == HorizontalScrollbar)
-    return m_scrollableArea->scrollAnimator().desiredTargetPosition().x() -
-           m_scrollableArea->minimumScrollPosition().x();
+  if (m_orientation == HorizontalScrollbar) {
+    return m_scrollableArea->scrollAnimator().desiredTargetOffset().width() -
+           m_scrollableArea->minimumScrollOffset().width();
+  }
 
-  return m_scrollableArea->scrollAnimator().desiredTargetPosition().y() -
-         m_scrollableArea->minimumScrollPosition().y();
+  return m_scrollableArea->scrollAnimator().desiredTargetOffset().height() -
+         m_scrollableArea->minimumScrollOffset().height();
 }
 
 LayoutRect Scrollbar::visualRect() const {