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

[mitz at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 960a97d86dd4ea902a0f18efdfe68c6c22915429
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 13 18:24:17 2011 +0000

    Incorrect assertion in DrawingAreaImpl::scroll()
    https://bugs.webkit.org/show_bug.cgi?id=52376
    
    Reviewed by John Sullivan.
    
    * WebProcess/WebPage/DrawingAreaImpl.cpp:
    (WebKit::DrawingAreaImpl::scroll): Changed to take the fast path if the rects have the same area.
    This made the assertion valid, but I removed it anyway.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75722 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c5c50fd..8af95b0 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-13  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by John Sullivan.
+
+        Incorrect assertion in DrawingAreaImpl::scroll()
+        https://bugs.webkit.org/show_bug.cgi?id=52376
+
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::scroll): Changed to take the fast path if the rects have the same area.
+        This made the assertion valid, but I removed it anyway.
+
 2011-01-12  Balazs Kelemen  <kbalazs at webkit.org>
 
         Unreviewed.
diff --git a/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp b/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
index 8f7e734..1e477a2 100644
--- a/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
+++ b/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
@@ -71,15 +71,13 @@ void DrawingAreaImpl::scroll(const IntRect& scrollRect, const IntSize& scrollDel
         unsigned long long scrollArea = scrollRect.width() * scrollRect.height();
         unsigned long long currentScrollArea = m_scrollRect.width() * m_scrollRect.height();
 
-        if (currentScrollArea > scrollArea) {
-            // The rect being scrolled has a greater area than the rect we'd like to scroll.
+        if (currentScrollArea >= scrollArea) {
+            // The rect being scrolled is at least as large as the rect we'd like to scroll.
             // Go ahead and just invalidate the scroll rect.
             setNeedsDisplay(scrollRect);
             return;
         }
 
-        ASSERT(scrollArea > currentScrollArea);
-
         // Just repaint the entire current scroll rect, we'll scroll the new rect instead.
         setNeedsDisplay(m_scrollRect);
         m_scrollRect = IntRect();

-- 
WebKit Debian packaging