[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[weinig at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 8c5b808568ee779d33f803ba31585087626ede05
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 21 03:46:13 2011 +0000

    Fix failing tests from r76291.
    
    Reviewed by Gavin Barraclough.
    
    * platform/ScrollView.cpp:
    (WebCore::ScrollView::scrollPosition):
    (WebCore::ScrollView::updateScrollbars):
    Take the scroll origin into account in more places.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76330 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2a34519..c426728 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-20  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Gavin Barraclough.
+
+        Fix failing tests from r76291.
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::scrollPosition):
+        (WebCore::ScrollView::updateScrollbars):
+        Take the scroll origin into account in more places.
+
 2011-01-20  Kent Tamura  <tkent at chromium.org>
 
         Unreviewed, sorting an Xcode project file.
diff --git a/Source/WebCore/platform/ScrollView.cpp b/Source/WebCore/platform/ScrollView.cpp
index 5a68a9d..1010b15 100644
--- a/Source/WebCore/platform/ScrollView.cpp
+++ b/Source/WebCore/platform/ScrollView.cpp
@@ -349,9 +349,9 @@ void ScrollView::scrollTo(const IntSize& newOffset)
 int ScrollView::scrollPosition(Scrollbar* scrollbar) const
 {
     if (scrollbar->orientation() == HorizontalScrollbar)
-        return scrollPosition().x();
+        return scrollPosition().x() + m_scrollOrigin.x();
     if (scrollbar->orientation() == VerticalScrollbar)
-        return scrollPosition().y();
+        return scrollPosition().y() + m_scrollOrigin.y();
     return 0;
 }
 
@@ -548,7 +548,7 @@ void ScrollView::updateScrollbars(const IntSize& desiredOffset)
         updateScrollCorner();
     }
 
-    ScrollbarClient::scrollToOffsetWithoutAnimation(FloatPoint(scroll.width(), scroll.height()));
+    ScrollbarClient::scrollToOffsetWithoutAnimation(FloatPoint(scroll.width() + m_scrollOrigin.x(), scroll.height() + m_scrollOrigin.y()));
 
     m_inUpdateScrollbars = false;
 }

-- 
WebKit Debian packaging