[DO NOT SUBMIT] Testing a reverted CL to see if changes catch regression.

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

 /*
  * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 235 matching lines @@
 void Scrollbar::moveThumb(int pos, bool draggingDocument) {
   if (!m_scrollableArea)
     return;
 
   int delta = pos - m_pressedPos;
 
   if (draggingDocument) {
     if (m_draggingDocument)
       delta = pos - m_documentDragPos;
     m_draggingDocument = true;
-    ScrollOffset currentPosition =
-        m_scrollableArea->scrollAnimator().currentOffset();
+    ScrollOffset currentPosition = m_scrollableArea->scrollOffset();
     float destinationPosition =
         (m_orientation == HorizontalScrollbar ? currentPosition.width()
                                               : currentPosition.height()) +
         delta;
     destinationPosition =
         m_scrollableArea->clampScrollOffset(m_orientation, destinationPosition);
     m_scrollableArea->setScrollOffsetSingleAxis(
         m_orientation, destinationPosition, UserScroll);
     m_documentDragPos = pos;
     return;
@@ skipping 330 matching lines @@
 
   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().desiredTargetOffset().width() -
+    return m_scrollableArea->scrollAnimatorDesiredTargetOffset().width() -
            m_scrollableArea->minimumScrollOffset().width();
   }
 
-  return m_scrollableArea->scrollAnimator().desiredTargetOffset().height() -
+  return m_scrollableArea->scrollAnimatorDesiredTargetOffset().height() -
          m_scrollableArea->minimumScrollOffset().height();
 }
 
 LayoutRect Scrollbar::visualRect() const {
   return m_scrollableArea ? m_scrollableArea->visualRectForScrollbarParts()
                           : LayoutRect();
 }
 
 void Scrollbar::setNeedsPaintInvalidation(ScrollbarPart invalidParts) {
   if (m_theme.shouldRepaintAllPartsOnInvalidation())
     invalidParts = AllParts;
   if (invalidParts & ~ThumbPart)
     m_trackNeedsRepaint = true;
   if (invalidParts & ThumbPart)
     m_thumbNeedsRepaint = true;
   if (m_scrollableArea)
     m_scrollableArea->setScrollbarNeedsPaintInvalidation(orientation());
 }
 
 }  // namespace blink