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

WebKit/win/WebScrollBar.cpp

 /*
  * Copyright (C) 2007 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 125 matching lines @@
     /* [in] */ RECT bounds)
 {
     IntRect rect(bounds.left, bounds.top, bounds.right-bounds.left, bounds.bottom-bounds.top);
     m_scrollBar->setFrameRect(rect);
     return S_OK;
 }
 
 HRESULT STDMETHODCALLTYPE WebScrollBar::setValue( 
     /* [in] */ int value)
 {
-    m_scrollBar->setValue(value);
+    m_scrollBar->setValue(value, Scrollbar::NotFromScrollAnimator);
     return S_OK;
 }
 
 HRESULT STDMETHODCALLTYPE WebScrollBar::value(
     /* [retval][out] */ int* value)
 {
     if (!value)
         return E_POINTER;
     *value = m_scrollBar->value();
     return S_OK;
@@ skipping 88 matching lines @@
     WebScrollGranularity granularity,
     float multiplier)
 {
     ScrollDirection webCoreScrollDirection = (ScrollDirection) direction;
     ScrollGranularity webCoreGranularity = (ScrollGranularity) granularity;
     m_scrollBar->scroll(webCoreScrollDirection, webCoreGranularity, multiplier);
     return S_OK;
 }
 
 // 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) {
         ASSERT(false);  // shouldn't happen
         return;
     }
     m_delegate->valueChanged(this);
 }
 
 void WebScrollBar::invalidateScrollbarRect(Scrollbar*, const IntRect& rect)
 {
     RECT r = rect;
     ::InvalidateRect(m_containingWindow, &r, false);
 }