Changeset 140091 in webkit

Timestamp:

Jan 17, 2013 7:23:28 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Update GraphicsContext to support winding rule in clip operator for Cairo
​https://bugs.webkit.org/show_bug.cgi?id=107065

Patch by Rik Cabanier <​cabanier@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/cairo/GraphicsContextCairo.cpp:

(WebCore::GraphicsContext::clip): Use passed in winding rule.
(WebCore::GraphicsContext::canvasClip): Rename variable.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-17  Rik Cabanier  <cabanier@adobe.com>
+
+        Update GraphicsContext to support winding rule in clip operator for Cairo
+        https://bugs.webkit.org/show_bug.cgi?id=107065
+
+        Reviewed by Dirk Schulze.
+
+        Added support for winding to clip() and canvasClip() functions.
+
+        No new tests, no change in behavior.
+
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::clip): Use passed in winding rule.
+        (WebCore::GraphicsContext::canvasClip): Rename variable.
+
 2013-01-17  Elliott Sprehn  <esprehn@chromium.org>
 

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

@@ -998 +998 @@
 }
 
-// FIXME: don't ignore the winding rule. https://bugs.webkit.org/show_bug.cgi?id=107065
-void GraphicsContext::clip(const Path& path, WindRule)
+void GraphicsContext::clip(const Path& path, WindRule windRule)
 {
     if (paintingDisabled())
@@ -1011 +1010 @@
     }
     cairo_fill_rule_t savedFillRule = cairo_get_fill_rule(cr);
-    cairo_set_fill_rule(cr, CAIRO_FILL_RULE_WINDING);
+    if (windRule == RULE_NONZERO)
+        cairo_set_fill_rule(cr, CAIRO_FILL_RULE_WINDING);
+    else
+        cairo_set_fill_rule(cr, CAIRO_FILL_RULE_EVEN_ODD);
     cairo_clip(cr);
     cairo_set_fill_rule(cr, savedFillRule);
@@ -1017 +1019 @@
 }
 
-void GraphicsContext::canvasClip(const Path& path, WindRule fillRule)
-{
-    clip(path, fillRule);
+void GraphicsContext::canvasClip(const Path& path, WindRule windRule)
+{
+    clip(path, windRule);
 }