diff options
| author |  Florin Malita <fmalita@chromium.org> | 2017-10-10 11:22:08 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-10 19:23:23 +0000 |
| commit | 57a0edf7ba03082e649f0c2ddc43930dfa849e7f (patch) | |
| tree | fc2f9d38bc9d052b048b85a5b353bb89cbf75948 /experimental/svg/model/SkSVGPath.cpp | |
| parent | e6984a0fb5557134165403400405bfda7ee03bef (diff) | |
[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>
Diffstat (limited to 'experimental/svg/model/SkSVGPath.cpp')
| -rw-r--r-- | experimental/svg/model/SkSVGPath.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/experimental/svg/model/SkSVGPath.cpp b/experimental/svg/model/SkSVGPath.cpp index 7568744035..3c09ab9885 100644 --- a/experimental/svg/model/SkSVGPath.cpp +++ b/experimental/svg/model/SkSVGPath.cpp @@ -33,10 +33,9 @@ void SkSVGPath::onDraw(SkCanvas* canvas, const SkSVGLengthContext&, const SkPain } SkPath SkSVGPath::onAsPath(const SkSVGRenderContext& ctx) const { - // the computed fillType follows inheritance rules and needs to be applied at draw time. - fPath.setFillType(FillRuleToFillType(*ctx.presentationContext().fInherited.fFillRule.get())); - SkPath path = fPath; + // clip-rule can be inherited and needs to be applied at clip time. + path.setFillType(ctx.presentationContext().fInherited.fClipRule.get()->asFillType()); this->mapToParent(&path); return path; } |