The following commit has been merged in the debian/experimental branch:
commit 87300835d429d47e9e22b3df109bcaacf162ee8a
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 12 14:05:43 2010 +0000
2010-10-12 Andreas Kling <kling at webkit.org>
Reviewed by Antonio Gomes.
[Qt] Clipping problem viewing SVG with WebKit
https://bugs.webkit.org/show_bug.cgi?id=29596
SVG path clipping (via GraphicsContext::clipPath()) was done using the
Qt::ReplaceClip mode (default) instead of Qt::IntersectClip. This led
to misrenderings when nesting multiple clip paths.
* platform/graphics/qt/GraphicsContextQt.cpp:
(WebCore::GraphicsContext::clipPath):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69579 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 61d5d87..9cd6e73 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-12 Andreas Kling <kling at webkit.org>
+
+ Reviewed by Antonio Gomes.
+
+ [Qt] Clipping problem viewing SVG with WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=29596
+
+ SVG path clipping (via GraphicsContext::clipPath()) was done using the
+ Qt::ReplaceClip mode (default) instead of Qt::IntersectClip. This led
+ to misrenderings when nesting multiple clip paths.
+
+ * platform/graphics/qt/GraphicsContextQt.cpp:
+ (WebCore::GraphicsContext::clipPath):
+
2010-10-07 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 6d6c1fc..897aecd 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -785,7 +785,7 @@ void GraphicsContext::clipPath(WindRule clipRule)
QPainter* p = m_data->p();
QPainterPath newPath = m_data->currentPath;
newPath.setFillRule(clipRule == RULE_EVENODD ? Qt::OddEvenFill : Qt::WindingFill);
- p->setClipPath(newPath);
+ p->setClipPath(newPath, Qt::IntersectClip);
}
void GraphicsContext::drawFocusRing(const Vector<Path>& paths, int width, int offset, const Color& color)
--
WebKit Debian packaging