[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 e1f5dedceee0cd3ef2d48f9783c5537689bfa1ed
Author: pkasting at chromium.org <pkasting at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 22:05:47 2010 +0000

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

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 21fd7d8..e54c5cd 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -3,6 +3,14 @@
         Not reviewed, build fix.
 
         * WebScrollBar.cpp:
+        (WebScrollBar::scrollSize):
+        (WebScrollBar::setScrollOffsetFromAnimation):
+
+2010-09-08  Peter Kasting  <pkasting at google.com>
+
+        Not reviewed, build fix.
+
+        * WebScrollBar.cpp:
         (WebScrollBar::setValue):
         (WebScrollBar::scrollSize):
         (WebScrollBar::setScrollOffsetFromAnimation):
diff --git a/WebKit/win/WebScrollBar.cpp b/WebKit/win/WebScrollBar.cpp
index f3f60ea..37283b9 100644
--- a/WebKit/win/WebScrollBar.cpp
+++ b/WebKit/win/WebScrollBar.cpp
@@ -254,12 +254,12 @@ HRESULT STDMETHODCALLTYPE WebScrollBar::scroll(
 // ScrollbarClient -------------------------------------------------------
 int WebScrollBar::scrollSize(ScrollbarOrientation orientation) const
 {
-    return (orientation == m_scrollBar->orientation()) ? (m_scrollbar->totalSize() - m_scrollbar->visibleSize()) : 0; 
+    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);
+    m_scrollBar->setValue((m_scrollBar->orientation() == HorizontalScrollbar) ? offset.x() : offset.y(), Scrollbar::FromScrollAnimator);
 }
 
 void WebScrollBar::valueChanged(Scrollbar* scrollBar)

-- 
WebKit Debian packaging