Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>...

WebCore/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 83 matching lines @@
     Widget::setFrameRect(IntRect(0, 0, thickness, thickness));
 }
 
 Scrollbar::~Scrollbar()
 {
     stopTimerIfNeeded();
     
     m_theme->unregisterScrollbar(this);
 }
 
-bool Scrollbar::setValue(int v)
+bool Scrollbar::setValue(int v, ScrollSource source)
 {
     v = max(min(v, m_totalSize - m_visibleSize), 0);
     if (value() == v)
         return false; // Our value stayed the same.
-    setCurrentPos(v);
+    setCurrentPos(v, source);
     return true;
 }
 
 void Scrollbar::setProportion(int visibleSize, int totalSize)
 {
     if (visibleSize == m_visibleSize && totalSize == m_totalSize)
         return;
 
     m_visibleSize = visibleSize;
     m_totalSize = totalSize;
@@ skipping 27 matching lines @@
         return false;
     float step = 0;
     switch (granularity) {
     case ScrollByLine:     step = m_lineStep;  break;
     case ScrollByPage:     step = m_pageStep;  break;
     case ScrollByDocument: step = m_totalSize; break;
     case ScrollByPixel:    step = m_pixelStep; break;
     }
     if (direction == ScrollUp || direction == ScrollLeft)
         multiplier = -multiplier;
+    if (client())
+        return client()->scroll(m_orientation, granularity, step, multiplier);
 
-    return setCurrentPos(max(min(m_currentPos + (step * multiplier), static_cast<float>(m_totalSize - m_visibleSize)), 0.0f));
+    return setCurrentPos(max(min(m_currentPos + (step * multiplier), static_cast<float>(m_totalSize - m_visibleSize)), 0.0f), NotFromScrollAnimator);
 }
 
 void Scrollbar::updateThumb()
 {
 #ifdef THUMB_POSITION_AFFECTS_BUTTONS
     invalidate();
 #else
     theme()->invalidateParts(this, ForwardTrackPart | BackTrackPart | ThumbPart);
 #endif
 }
@@ skipping 111 matching lines @@
     int thumbPos = theme()->thumbPosition(this);
     int thumbLen = theme()->thumbLength(this);
     int trackLen = theme()->trackLength(this);
     int maxPos = trackLen - thumbLen;
     int delta = pos - m_pressedPos;
     if (delta > 0)
         delta = min(maxPos - thumbPos, delta);
     else if (delta < 0)
         delta = max(-thumbPos, delta);
     if (delta)
-        setCurrentPos(static_cast<float>(thumbPos + delta) * maximum() / (trackLen - thumbLen));
+        setCurrentPos(static_cast<float>(thumbPos + delta) * maximum() / (trackLen - thumbLen), NotFromScrollAnimator);
 }
 
-bool Scrollbar::setCurrentPos(float pos)
+bool Scrollbar::setCurrentPos(float pos, ScrollSource source)
 {
+    if ((source != FromScrollAnimator) && client())
+        client()->setScrollPositionAndStopAnimation(m_orientation, pos);
+
     if (pos == m_currentPos)
         return false;
 
     int oldValue = value();
     int oldThumbPos = theme()->thumbPosition(this);
     m_currentPos = pos;
     updateThumbPosition();
     if (m_pressedPart == ThumbPart)
         setPressedPos(m_pressedPos + theme()->thumbPosition(this) - oldThumbPos);
 
@@ skipping 24 matching lines @@
     if (m_pressedPart != NoPart)
         theme()->invalidatePart(this, m_pressedPart);
     else if (m_hoveredPart != NoPart)  // When we no longer have a pressed part, we can start drawing a hovered state on the hovered part.
         theme()->invalidatePart(this, m_hoveredPart);
 }
 
 bool Scrollbar::mouseMoved(const PlatformMouseEvent& evt)
 {
     if (m_pressedPart == ThumbPart) {
         if (theme()->shouldSnapBackToDragOrigin(this, evt))
-            setCurrentPos(m_dragOrigin);
+            setCurrentPos(m_dragOrigin, NotFromScrollAnimator);
         else {
             moveThumb(m_orientation == HorizontalScrollbar ? 
                       convertFromContainingWindow(evt.pos()).x() :
                       convertFromContainingWindow(evt.pos()).y());
         }
         return true;
     }
 
     if (m_pressedPart != NoPart)
         m_pressedPos = (orientation() == HorizontalScrollbar ? convertFromContainingWindow(evt.pos()).x() : convertFromContainingWindow(evt.pos()).y());
@@ skipping 155 matching lines @@
 
 IntPoint Scrollbar::convertFromContainingView(const IntPoint& parentPoint) const
 {
     if (m_client)
         return m_client->convertFromContainingViewToScrollbar(this, parentPoint);
 
     return Widget::convertFromContainingView(parentPoint);
 }
 
 }