[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[pkasting at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 87f519a506d5336b013f80627143c63e5a350c31
Author: pkasting at chromium.org <pkasting at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 21:49:49 2010 +0000

    Not reviewed, build fix.
    
    * WebScrollBar.cpp:
    (WebScrollBar::setValue):
    (WebScrollBar::scrollSize):
    (WebScrollBar::setScrollOffsetFromAnimation):
    * WebScrollBar.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67018 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index ad5a8e4..21fd7d8 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-08  Peter Kasting  <pkasting at google.com>
+
+        Not reviewed, build fix.
+
+        * WebScrollBar.cpp:
+        (WebScrollBar::setValue):
+        (WebScrollBar::scrollSize):
+        (WebScrollBar::setScrollOffsetFromAnimation):
+        * WebScrollBar.h:
+
 2010-09-08  Adam Barth  <abarth at webkit.org>
 
         Attempted Window build fix.
diff --git a/WebKit/win/WebScrollBar.cpp b/WebKit/win/WebScrollBar.cpp
index ccf40d9..f3f60ea 100644
--- a/WebKit/win/WebScrollBar.cpp
+++ b/WebKit/win/WebScrollBar.cpp
@@ -143,7 +143,7 @@ HRESULT STDMETHODCALLTYPE WebScrollBar::setRect(
 HRESULT STDMETHODCALLTYPE WebScrollBar::setValue( 
     /* [in] */ int value)
 {
-    m_scrollBar->setValue(value);
+    m_scrollBar->setValue(value, Scrollbar::NotFromScrollAnimator);
     return S_OK;
 }
 
@@ -252,6 +252,16 @@ HRESULT STDMETHODCALLTYPE WebScrollBar::scroll(
 }
 
 // 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) {
diff --git a/WebKit/win/WebScrollBar.h b/WebKit/win/WebScrollBar.h
index 0fed8a3..90f2491 100644
--- a/WebKit/win/WebScrollBar.h
+++ b/WebKit/win/WebScrollBar.h
@@ -116,6 +116,8 @@ public:
 
 protected:
     // ScrollbarClient
+    virtual int scrollSize(ScrollbarOrientation orientation) const;
+    virtual void setScrollOffsetFromAnimation(const IntPoint&);
     virtual void valueChanged(Scrollbar*);
     virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&);
 

-- 
WebKit Debian packaging