Merge 67018 - Not reviewed, build fix....

WebKit/win/WebScrollBar.cpp

Index: WebKit/win/WebScrollBar.cpp
===================================================================
--- WebKit/win/WebScrollBar.cpp	(revision 67018)
+++ WebKit/win/WebScrollBar.cpp	(working copy)
@@ -143,7 +143,7 @@
 HRESULT STDMETHODCALLTYPE WebScrollBar::setValue( 
     /* [in] */ int value)
 {
-    m_scrollBar->setValue(value);
+    m_scrollBar->setValue(value, Scrollbar::NotFromScrollAnimator);
     return S_OK;
 }
 
@@ -252,6 +252,16 @@
 }
 
 // ScrollbarClient -------------------------------------------------------
+int WebScrollBar::scrollSize(ScrollbarOrientation orientation) const
+{
+    return (orientation == m_scrollBar->orientation()) ? (m_scrollbar->totalSize() - m_scrollbar->visibleSize()) : 0; 
+}
+
+void WebScrollBar::setScrollOffsetFromAnimation(const IntPoint&)
+{
+    m_scrollbar->setValue((m_scrollBar->orientation() == HorizontalScrollbar) ? offset.x() : offset.y(), Scrollbar::FromScrollAnimator);
+}
+
 void WebScrollBar::valueChanged(Scrollbar* scrollBar)
 {
     if (m_scrollBar != scrollBar) {