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

[reni at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 99090c678639d31cf6f19b3366c1d07d66748f6d
Author: reni at webkit.org <reni at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 12:38:13 2010 +0000

    [Qt] GraphicsContext::clip(path) should clip using winding fill
    https://bugs.webkit.org/show_bug.cgi?id=49912
    
    Patch by Renata Hodovan <reni at webkit.org> on 2010-12-02
    Reviewed by Andreas Kling.
    
    GraphicsContext::clip(path) now uses winding fill and this function is called by
    GraphicsContext::canvasClip(path).
    
    No new test is needed.
    
    * platform/graphics/qt/GraphicsContextQt.cpp:
    (WebCore::GraphicsContext::clip):
    (WebCore::GraphicsContext::canvasClip):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73123 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index eee4304..6b336cf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-02  Renata Hodovan  <reni at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] GraphicsContext::clip(path) should clip using winding fill 
+        https://bugs.webkit.org/show_bug.cgi?id=49912
+
+        GraphicsContext::clip(path) now uses winding fill and this function is called by
+        GraphicsContext::canvasClip(path).
+
+        No new test is needed.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::clip):
+        (WebCore::GraphicsContext::canvasClip):
+
 2010-12-01  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index a840525..0d6c640 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -1130,17 +1130,14 @@ void GraphicsContext::clip(const Path& path)
     if (paintingDisabled())
         return;
 
-    m_data->p()->setClipPath(path.platformPath(), Qt::IntersectClip);
+    QPainterPath clipPath = path.platformPath();
+    clipPath.setFillRule(Qt::WindingFill);
+    m_data->p()->setClipPath(clipPath, Qt::IntersectClip);
 }
 
 void GraphicsContext::canvasClip(const Path& path)
 {
-    if (paintingDisabled())
-        return;
-
-    QPainterPath clipPath = path.platformPath();
-    clipPath.setFillRule(Qt::WindingFill);
-    m_data->p()->setClipPath(clipPath, Qt::IntersectClip);
+    clip(path);
 }
 
 void GraphicsContext::clipOut(const Path& path)

-- 
WebKit Debian packaging