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

andreas.kling at nokia.com andreas.kling at nokia.com
Wed Dec 22 14:40:17 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ba38e7fa3491381502eb935d456ffa2c19510165
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 15 13:56:24 2010 +0000

    2010-10-15  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Unbreak scrolling the ContentsLayer with QWebView
    
            r69777 broke scrolling the contents layer in QWebView by not restoring
            the painter clip after painting each part of the dirty region.
    
            * Api/qwebframe.cpp:
            (QWebFramePrivate::renderRelativeCoords):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69851 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index d2a871a..39e74d9 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -328,13 +328,12 @@ void QWebFramePrivate::renderRelativeCoords(GraphicsContext* context, QWebFrame:
 
             QRect intersectedRect = clipRect.intersected(view->frameRect());
 
+            context->save();
             painter->setClipRect(clipRect, Qt::IntersectClip);
 
             int x = view->x();
             int y = view->y();
 
-            context->save();
-
             int scrollX = view->scrollX();
             int scrollY = view->scrollY();
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 9d72edb..616d558 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-15  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Unbreak scrolling the ContentsLayer with QWebView
+
+        r69777 broke scrolling the contents layer in QWebView by not restoring
+        the painter clip after painting each part of the dirty region.
+
+        * Api/qwebframe.cpp:
+        (QWebFramePrivate::renderRelativeCoords):
+
 2010-09-27 Dawit Alemayehu  <adawit at kde.org>
 
         Reviewed by Andreas Kling.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list