[SVGDom] Add clip-rule support

Currently we use 'fill-rule' when emitting clip paths.  This is wrong:
per spec [1], clip paths observe 'clip-rule', not 'fill-rule'.

[1] https://www.w3.org/TR/SVG/masking.html#ClipRuleProperty

Change-Id: Idf81de05e9601663c8dbc9856900ffa679daf4a5
Reviewed-on: https://skia-review.googlesource.com/57661
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Stephan Altmueller <stephana@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>

1 files changed, 1 insertions, 14 deletions

diff --git a/experimental/svg/model/SkSVGShape.cpp b/experimental/svg/model/SkSVGShape.cpp
index 9351a2f096..7394bc67b4 100644
--- a/experimental/svg/model/SkSVGShape.cpp
+++ b/experimental/svg/model/SkSVGShape.cpp
@@ -11,8 +11,7 @@
 SkSVGShape::SkSVGShape(SkSVGTag t) : INHERITED(t) {}
 
 void SkSVGShape::onRender(const SkSVGRenderContext& ctx) const {
-    const SkPath::FillType fillType =
-        FillRuleToFillType(*ctx.presentationContext().fInherited.fFillRule.get());
+    const auto fillType = ctx.presentationContext().fInherited.fFillRule.get()->asFillType();
 
     // TODO: this approach forces duplicate geometry resolution in onDraw(); refactor to avoid.
     if (const SkPaint* fillPaint = ctx.fillPaint()) {
@@ -27,15 +26,3 @@ void SkSVGShape::onRender(const SkSVGRenderContext& ctx) const {
 void SkSVGShape::appendChild(sk_sp<SkSVGNode>) {
     SkDebugf("cannot append child nodes to an SVG shape.\n");
 }
-
-SkPath::FillType SkSVGShape::FillRuleToFillType(const SkSVGFillRule& fillRule) {
-    switch (fillRule.type()) {
-    case SkSVGFillRule::Type::kNonZero:
-        return SkPath::kWinding_FillType;
-    case SkSVGFillRule::Type::kEvenOdd:
-        return SkPath::kEvenOdd_FillType;
-    default:
-        SkASSERT(false);
-        return SkPath::kWinding_FillType;
-    }
-}