[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 e89b577fe6f5ba8d2898af44914cdee725bf4585
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 31 19:30:31 2010 +0000

    2010-10-31  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Dirk Schulze.
    
            [Qt] Respect the "antialiased" argument in clipConvexPolygon()
            https://bugs.webkit.org/show_bug.cgi?id=48734
    
            Set (or unset) the QPainter::Antialiased render hint for antialiased
            clipping based on the "antialiased" argument.
    
            No test since Qt doesn't have pixel tests yet.
    
            * platform/graphics/qt/GraphicsContextQt.cpp:
            (WebCore::GraphicsContext::clipConvexPolygon):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70995 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b1d18f2..7ce2f18 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,21 @@
 
         Reviewed by Dirk Schulze.
 
+        [Qt] Respect the "antialiased" argument in clipConvexPolygon()
+        https://bugs.webkit.org/show_bug.cgi?id=48734
+
+        Set (or unset) the QPainter::Antialiased render hint for antialiased
+        clipping based on the "antialiased" argument.
+
+        No test since Qt doesn't have pixel tests yet.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::clipConvexPolygon):
+
+2010-10-31  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Dirk Schulze.
+
         Remove the unused GraphicsContext::strokeRect(FloatRect)
         https://bugs.webkit.org/show_bug.cgi?id=48726
 
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index de18d61..e778ed5 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -504,7 +504,18 @@ void GraphicsContext::clipConvexPolygon(size_t numPoints, const FloatPoint* poin
     for (size_t i = 1; i < numPoints; ++i)
         path.lineTo(points[i]);
     path.setFillRule(Qt::WindingFill);
-    m_data->p()->setClipPath(path, Qt::IntersectClip);
+
+    QPainter* p = m_data->p();
+
+    bool painterWasAntialiased = p->testRenderHint(QPainter::Antialiasing);
+
+    if (painterWasAntialiased != antialiased)
+        p->setRenderHint(QPainter::Antialiasing, antialiased);
+
+    p->setClipPath(path, Qt::IntersectClip);
+
+    if (painterWasAntialiased != antialiased)
+        p->setRenderHint(QPainter::Antialiasing, painterWasAntialiased);
 }
 
 void GraphicsContext::fillPath()

-- 
WebKit Debian packaging