aboutsummaryrefslogtreecommitdiffhomepage
path: root/experimental/svg/model/SkSVGNode.cpp
diff options
context:
space:
mode:
authorGravatar Florin Malita <fmalita@chromium.org>2017-10-10 11:22:08 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-10-10 19:23:23 +0000
commit57a0edf7ba03082e649f0c2ddc43930dfa849e7f (patch)
treefc2f9d38bc9d052b048b85a5b353bb89cbf75948 /experimental/svg/model/SkSVGNode.cpp
parente6984a0fb5557134165403400405bfda7ee03bef (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/SkSVGNode.cpp')
-rw-r--r--experimental/svg/model/SkSVGNode.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/experimental/svg/model/SkSVGNode.cpp b/experimental/svg/model/SkSVGNode.cpp
index 46d6423af2..dfd25bafbb 100644
--- a/experimental/svg/model/SkSVGNode.cpp
+++ b/experimental/svg/model/SkSVGNode.cpp
@@ -61,6 +61,10 @@ void SkSVGNode::setClipPath(const SkSVGClip& clip) {
fPresentationAttributes.fClipPath.set(clip);
}
+void SkSVGNode::setClipRule(const SkSVGFillRule& clipRule) {
+ fPresentationAttributes.fClipRule.set(clipRule);
+}
+
void SkSVGNode::setFill(const SkSVGPaint& svgPaint) {
fPresentationAttributes.fFill.set(svgPaint);
}
@@ -99,6 +103,11 @@ void SkSVGNode::onSetAttribute(SkSVGAttribute attr, const SkSVGValue& v) {
this->setClipPath(*clip);
}
break;
+ case SkSVGAttribute::kClipRule:
+ if (const SkSVGFillRuleValue* clipRule = v.as<SkSVGFillRuleValue>()) {
+ this->setClipRule(*clipRule);
+ }
+ break;
case SkSVGAttribute::kFill:
if (const SkSVGPaintValue* paint = v.as<SkSVGPaintValue>()) {
this->setFill(*paint);