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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 7d61c569136d572fc518027f147a5b7497653d91
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 17 21:16:11 2010 +0000

    2010-11-17  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            ScrollView: Avoid unnecessary work in setScrollPosition() when scrolling is delegated.
    
            * platform/ScrollView.cpp:
            (WebCore::ScrollView::setScrollPosition): If delegatesScrolling(), we never use the
            newScrollPosition, so move that calculation below the delegation path.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72238 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 909194c..cb83141 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-17  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        ScrollView: Avoid unnecessary work in setScrollPosition() when scrolling is delegated.
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::setScrollPosition): If delegatesScrolling(), we never use the
+        newScrollPosition, so move that calculation below the delegation path.
+
 2010-11-17  Dave Hyatt  <hyatt at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp
index bd75b83..4ef0e2b 100644
--- a/WebCore/platform/ScrollView.cpp
+++ b/WebCore/platform/ScrollView.cpp
@@ -333,9 +333,6 @@ void ScrollView::setScrollPosition(const IntPoint& scrollPoint)
         return;
     }
 
-    IntPoint newScrollPosition = scrollPoint.shrunkTo(maximumScrollPosition());
-    newScrollPosition.clampNegativeToZero();
-
 #if ENABLE(TILED_BACKING_STORE)
     if (delegatesScrolling()) {
         hostWindow()->delegatedScrollRequested(IntSize(scrollPoint.x(), scrollPoint.y()));
@@ -343,6 +340,9 @@ void ScrollView::setScrollPosition(const IntPoint& scrollPoint)
     }
 #endif
 
+    IntPoint newScrollPosition = scrollPoint.shrunkTo(maximumScrollPosition());
+    newScrollPosition.clampNegativeToZero();
+
     if (newScrollPosition == scrollPosition())
         return;
 

-- 
WebKit Debian packaging