Merge WebKit at r76408: Initial merge by git.

Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53

1 files changed, 10 insertions, 11 deletions

diff --git a/Source/WebKit/win/WebScrollBar.cpp b/Source/WebKit/win/WebScrollBar.cpp
index 8613c1c..45bc8f3 100644
--- a/Source/WebKit/win/WebScrollBar.cpp
+++ b/Source/WebKit/win/WebScrollBar.cpp
@@ -42,6 +42,7 @@ using namespace WebCore;
 WebScrollBar::WebScrollBar()
     : m_refCount(0)
     , m_containingWindow(0)
+    , m_currentPosition(0)
 {
     gClassCount++;
     gClassNameCount.add("WebScrollBar");
@@ -143,7 +144,7 @@ HRESULT STDMETHODCALLTYPE WebScrollBar::setRect(
 HRESULT STDMETHODCALLTYPE WebScrollBar::setValue( 
     /* [in] */ int value)
 {
-    m_scrollBar->setValue(value, Scrollbar::NotFromScrollAnimator);
+    m_currentPosition = value;
     return S_OK;
 }
 
@@ -152,7 +153,7 @@ HRESULT STDMETHODCALLTYPE WebScrollBar::value(
 {
     if (!value)
         return E_POINTER;
-    *value = m_scrollBar->value();
+    *value = m_currentPosition;
     return S_OK;
 }
 
@@ -247,27 +248,25 @@ HRESULT STDMETHODCALLTYPE WebScrollBar::scroll(
 {
     ScrollDirection webCoreScrollDirection = (ScrollDirection) direction;
     ScrollGranularity webCoreGranularity = (ScrollGranularity) granularity;
-    m_scrollBar->scroll(webCoreScrollDirection, webCoreGranularity, multiplier);
+    ScrollableArea::scroll(webCoreScrollDirection, webCoreGranularity, multiplier);
     return S_OK;
 }
 
-// ScrollbarClient -------------------------------------------------------
+// ScrollableArea -------------------------------------------------------
+
 int WebScrollBar::scrollSize(ScrollbarOrientation orientation) const
 {
     return (orientation == m_scrollBar->orientation()) ? (m_scrollBar->totalSize() - m_scrollBar->visibleSize()) : 0; 
 }
 
-void WebScrollBar::setScrollOffsetFromAnimation(const IntPoint& offset)
+int WebScrollBar::scrollPosition(Scrollbar*) const
 {
-    m_scrollBar->setValue((m_scrollBar->orientation() == HorizontalScrollbar) ? offset.x() : offset.y(), Scrollbar::FromScrollAnimator);
+    return m_currentPosition;
 }
 
-void WebScrollBar::valueChanged(Scrollbar* scrollBar)
+void WebScrollBar::setScrollOffset(const IntPoint& offset)
 {
-    if (m_scrollBar != scrollBar) {
-        ASSERT(false);  // shouldn't happen
-        return;
-    }
+    m_currentPosition = (m_scrollBar->orientation() == HorizontalScrollbar) ? offset.x() : offset.y();
     m_delegate->valueChanged(this);
 }