diff options
author | Florin Malita <fmalita@chromium.org> | 2016-12-08 09:26:47 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-08 15:00:18 +0000 |
commit | ce8840e3842f3a702c5d7bf440ff730bdfaf8e70 (patch) | |
tree | 0a94cdeb3d2d8632644490b70fdb0c40d185b8ec /experimental/svg/model/SkSVGRenderContext.cpp | |
parent | c5a8366d9922902cffbd351fdd15755dd2ac99bf (diff) |
[SVGDom] ClipPath support
* clip-path attribute handling
* clipPath container element
* asPath() SkSVGNode virtual for capturing subtree geometry
R=robertphillips@google.com,stephana@google.com
Change-Id: I9597534fe3047b631da6309eafac055dff5696e9
Reviewed-on: https://skia-review.googlesource.com/5650
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'experimental/svg/model/SkSVGRenderContext.cpp')
-rw-r--r-- | experimental/svg/model/SkSVGRenderContext.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/experimental/svg/model/SkSVGRenderContext.cpp b/experimental/svg/model/SkSVGRenderContext.cpp index fd0262319a..d8307a05c0 100644 --- a/experimental/svg/model/SkSVGRenderContext.cpp +++ b/experimental/svg/model/SkSVGRenderContext.cpp @@ -280,6 +280,10 @@ void SkSVGRenderContext::applyPresentationAttributes(const SkSVGPresentationAttr if (auto* opacity = attrs.fOpacity.getMaybeNull()) { this->applyOpacity(opacity->value(), flags); } + + if (auto* clip = attrs.fClipPath.getMaybeNull()) { + this->applyClip(*clip); + } } void SkSVGRenderContext::applyOpacity(SkScalar opacity, uint32_t flags) { @@ -312,6 +316,26 @@ void SkSVGRenderContext::applyOpacity(SkScalar opacity, uint32_t flags) { } } +void SkSVGRenderContext::applyClip(const SkSVGClip& clip) { + if (clip.type() != SkSVGClip::Type::kIRI) { + return; + } + + const SkSVGNode* clipNode = this->findNodeById(clip.iri()); + if (!clipNode || clipNode->tag() != SkSVGTag::kClipPath) { + return; + } + + const SkPath clipPath = clipNode->asPath(*this); + + // Only save if needed + if (fCanvas->getSaveCount() == fCanvasSaveCount) { + fCanvas->save(); + } + + fCanvas->clipPath(clipPath, true); +} + const SkPaint* SkSVGRenderContext::fillPaint() const { const SkSVGPaint::Type paintType = fPresentationContext->fInherited.fFill.get()->type(); return paintType != SkSVGPaint::Type::kNone ? &fPresentationContext->fFillPaint : nullptr; |