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

ariya at webkit.org ariya at webkit.org
Wed Dec 22 11:50:02 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 603a5d5f60613863f7f0e0708d620e61064b4eae
Author: ariya at webkit.org <ariya at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 9 09:36:25 2010 +0000

    2010-08-09  Ariya Hidayat  <ariya at sencha.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] GraphicsContext::clipOut(IntRect) ignores the transformation matrix.
            https://bugs.webkit.org/show_bug.cgi?id=43705
    
            Just like clipOut(Path), which is taken care in r60796 already,
            clipOut(IntRect) must transform the window bounding box properly.
    
            * platform/graphics/qt/GraphicsContextQt.cpp:
            (WebCore::GraphicsContext::clipOut):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64971 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7531c65..3750784 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-09  Ariya Hidayat  <ariya at sencha.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] GraphicsContext::clipOut(IntRect) ignores the transformation matrix.
+        https://bugs.webkit.org/show_bug.cgi?id=43705
+
+        Just like clipOut(Path), which is taken care in r60796 already,
+        clipOut(IntRect) must transform the window bounding box properly.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::clipOut):
+
 2010-08-09  François Sausset  <sausset at gmail.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index e560e15..5d5c2c6 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -1192,7 +1192,7 @@ void GraphicsContext::clipOut(const IntRect& rect)
         p->setClipPath(newClip, Qt::IntersectClip);
     } else {
         QRect clipOutRect(rect);
-        QRect window(p->window());
+        QRect window = p->transform().inverted().mapRect(p->window());
         clipOutRect &= window;
         newClip.addRect(window);
         newClip.addRect(clipOutRect);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list