Reland "Unifies ScrollView and RenderLayer to use non-shi..."

Source/core/platform/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 277 matching lines @@
     if (!m_scrollableArea)
         return;
 
     int delta = pos - m_pressedPos;
 
     if (draggingDocument) {
         if (m_draggingDocument)
             delta = pos - m_documentDragPos;
         m_draggingDocument = true;
         FloatPoint currentPosition = m_scrollableArea->scrollAnimator()->currentPosition();
-        int destinationPosition = (m_orientation == HorizontalScrollbar ? currentPosition.x() : currentPosition.y()) + delta;
-        if (delta > 0)
-            destinationPosition = min(destinationPosition + delta, maximum());
-        else if (delta < 0)
-            destinationPosition = max(destinationPosition + delta, 0);
+        float destinationPosition = (m_orientation == HorizontalScrollbar ? currentPosition.x() : currentPosition.y()) + delta;
+        destinationPosition = m_scrollableArea->clampScrollPosition(m_orientation, destinationPosition);
         m_scrollableArea->scrollToOffsetWithoutAnimation(m_orientation, destinationPosition);
         m_documentDragPos = pos;
         return;
     }
 
     if (m_draggingDocument) {
         delta += m_pressedPos - m_documentDragPos;
         m_draggingDocument = false;
     }
 
     // Drag the thumb.
     int thumbPos = theme()->thumbPosition(this);
     int thumbLen = theme()->thumbLength(this);
     int trackLen = theme()->trackLength(this);
-    int maxPos = trackLen - thumbLen;
     if (delta > 0)
-        delta = min(maxPos - thumbPos, delta);
+        delta = min(trackLen - thumbLen - thumbPos, delta);
     else if (delta < 0)
         delta = max(-thumbPos, delta);
     
+    float minPos = m_scrollableArea->minimumScrollPosition(m_orientation);
+    float maxPos = m_scrollableArea->maximumScrollPosition(m_orientation);
     if (delta) {
-        float newPosition = static_cast<float>(thumbPos + delta) * maximum() / (trackLen - thumbLen);
+        float newPosition = static_cast<float>(thumbPos + delta) * (maxPos - minPos) / (trackLen - thumbLen) + minPos;
         m_scrollableArea->scrollToOffsetWithoutAnimation(m_orientation, newPosition);
     }
 }
 
 void Scrollbar::setHoveredPart(ScrollbarPart part)
 {
     if (part == m_hoveredPart)
         return;
 
     if ((m_hoveredPart == NoPart || part == NoPart) && theme()->invalidateOnMouseEnterExit())
@@ skipping 264 matching lines @@
 
 IntPoint Scrollbar::convertFromContainingView(const IntPoint& parentPoint) const
 {
     if (m_scrollableArea)
         return m_scrollableArea->convertFromContainingViewToScrollbar(this, parentPoint);
 
     return Widget::convertFromContainingView(parentPoint);
 }
 
 } // namespace WebCore