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

WebKit/chromium/src/WebScrollbarImpl.cpp

Index: WebKit/chromium/src/WebScrollbarImpl.cpp
===================================================================
--- WebKit/chromium/src/WebScrollbarImpl.cpp	(revision 67003)
+++ WebKit/chromium/src/WebScrollbarImpl.cpp	(working copy)
@@ -94,7 +94,7 @@
 
 void WebScrollbarImpl::setValue(int position)
 {
-    m_scrollbar->setValue(position);
+    m_scrollbar->setValue(position, Scrollbar::NotFromScrollAnimator);
 }
 
 void WebScrollbarImpl::setDocumentSize(int size)
@@ -218,7 +218,7 @@
                 if (negative)
                     delta *= -1;
             }
-            m_scrollbar->setValue(m_scrollbar->value() - delta);
+            m_scrollbar->scroll((m_scrollbar->orientation() == HorizontalScrollbar) ? WebCore::ScrollLeft : WebCore::ScrollUp, WebCore::ScrollByPixel, delta);
             return true;
         }
 
@@ -262,6 +262,16 @@
     return false;
 }
 
+int WebScrollbarImpl::scrollSize(WebCore::ScrollbarOrientation orientation) const
+{
+    return (orientation == m_scrollbar->orientation()) ? (m_scrollbar->totalSize() - m_scrollbar->visibleSize()) : 0;
+}
+
+void WebScrollbarImpl::setScrollOffsetFromAnimation(const WebCore::IntPoint& offset)
+{
+    m_scrollbar->setValue((m_scrollbar->orientation() == HorizontalScrollbar) ? offset.x() : offset.y(), Scrollbar::FromScrollAnimator);
+}
+
 void WebScrollbarImpl::valueChanged(WebCore::Scrollbar*)
 {
     m_client->valueChanged(this);