Title: [140094] trunk/Source/WebCore
- Revision
- 140094
- Author
- commit-qu...@webkit.org
- Date
- 2013-01-17 19:44:03 -0800 (Thu, 17 Jan 2013)
Log Message
Update GraphicsContext to support winding rule in clip operator for QT
https://bugs.webkit.org/show_bug.cgi?id=106873
Patch by Rik Cabanier <caban...@adobe.com> on 2013-01-17
Reviewed by Dirk Schulze.
Added support for winding to clip() and canvasClip() functions.
No new tests, no change in behavior.
* platform/graphics/qt/GraphicsContextQt.cpp:
(WebCore::GraphicsContext::clip): Use passed in winding rule.
(WebCore::GraphicsContext::canvasClip): Rename variable.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (140093 => 140094)
--- trunk/Source/WebCore/ChangeLog 2013-01-18 03:35:53 UTC (rev 140093)
+++ trunk/Source/WebCore/ChangeLog 2013-01-18 03:44:03 UTC (rev 140094)
@@ -1,5 +1,20 @@
2013-01-17 Rik Cabanier <caban...@adobe.com>
+ Update GraphicsContext to support winding rule in clip operator for QT
+ https://bugs.webkit.org/show_bug.cgi?id=106873
+
+ Reviewed by Dirk Schulze.
+
+ Added support for winding to clip() and canvasClip() functions.
+
+ No new tests, no change in behavior.
+
+ * platform/graphics/qt/GraphicsContextQt.cpp:
+ (WebCore::GraphicsContext::clip): Use passed in winding rule.
+ (WebCore::GraphicsContext::canvasClip): Rename variable.
+
+2013-01-17 Rik Cabanier <caban...@adobe.com>
+
Update GraphicsContext to support winding rule in clip operator for Cairo
https://bugs.webkit.org/show_bug.cgi?id=107065
Modified: trunk/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp (140093 => 140094)
--- trunk/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp 2013-01-18 03:35:53 UTC (rev 140093)
+++ trunk/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp 2013-01-18 03:44:03 UTC (rev 140094)
@@ -1251,20 +1251,19 @@
m_data->p()->setCompositionMode(toQtCompositionMode(op));
}
-// FIXME: don't ignore the winding rule. https://bugs.webkit.org/show_bug.cgi?id=106873
-void GraphicsContext::clip(const Path& path, WindRule)
+void GraphicsContext::clip(const Path& path, WindRule windRule)
{
if (paintingDisabled())
return;
QPainterPath clipPath = path.platformPath();
- clipPath.setFillRule(Qt::WindingFill);
+ clipPath.setFillRule(toQtFillRule(windRule));
m_data->p()->setClipPath(clipPath, Qt::IntersectClip);
}
-void GraphicsContext::canvasClip(const Path& path, WindRule fillRule)
+void GraphicsContext::canvasClip(const Path& path, WindRule windRule)
{
- clip(path, fillRule);
+ clip(path, windRule);
}
void GraphicsContext::clipOut(const Path& path)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
