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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 16:26:30 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit be45299ec06a40715990941d557a7e36019f2e38
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 23 20:33:07 2010 +0000

    2010-11-23  Grace Kloba  <klobag at chromium.org>
    
            Reviewed by Kenneth Russell.
    
            [chromium] Accumulated scroll damage rect should be in the content space
            https://bugs.webkit.org/show_bug.cgi?id=49842
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::scrollRootLayerRect): Adjust the previous scroll damage with the scroll delta before union it with the new damage rect.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72620 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 07eadbb..240e9fb 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-23  Grace Kloba  <klobag at chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        [chromium] Accumulated scroll damage rect should be in the content space
+        https://bugs.webkit.org/show_bug.cgi?id=49842
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::scrollRootLayerRect): Adjust the previous scroll damage with the scroll delta before union it with the new damage rect.
+
 2010-11-18  Darin Fisher  <darin at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index ff45d71..af81f32 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -2318,6 +2318,9 @@ void WebViewImpl::scrollRootLayerRect(const IntSize& scrollDelta, const IntRect&
         }
     }
 
+    // Move the previous damage
+    m_rootLayerScrollDamage.move(scrollDelta.width(), scrollDelta.height());
+    // Union with the new damage rect.
     m_rootLayerScrollDamage.unite(damagedContentsRect);
 
     // Scroll any existing damage that intersects with clip rect

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list