diff options
author | fmalita <fmalita@chromium.org> | 2016-08-08 11:38:55 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-08-08 11:38:55 -0700 |
commit | 397a517d1a5774653fcdd08172f9a6b5eea67621 (patch) | |
tree | ab9c9aaa4121a8033a29f259401bcecf7d178203 /experimental/svg/model/SkSVGAttribute.cpp | |
parent | f621ff49a288978c272d5ae069a6a1c04c74642b (diff) |
[SVGDom] Add viewBox support
The main feature is <svg> viewBox and proper viewport support, but the CL
touches a few other things:
* refactor SkSVGRenderContext to auto-restore canvas state, and split the
presentation bits into a separate CoW SkSVGPresentationContext
* introduce SkSVGNode::onPrepareToRender(), as a way for nodes to push their
custom state before the actual onRender() call (instead of relying on
non-virtual SkSVGNode to know about all possible state bits)
* add a "Type" suffix to SVG types, to disambiguate (e.g. SkSVGRectType vs.
SkSVGRect)
R=robertphillips@google.com,stephana@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2222793002
Review-Url: https://codereview.chromium.org/2222793002
Diffstat (limited to 'experimental/svg/model/SkSVGAttribute.cpp')
-rw-r--r-- | experimental/svg/model/SkSVGAttribute.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/experimental/svg/model/SkSVGAttribute.cpp b/experimental/svg/model/SkSVGAttribute.cpp index 79c355176f..2f1cace773 100644 --- a/experimental/svg/model/SkSVGAttribute.cpp +++ b/experimental/svg/model/SkSVGAttribute.cpp @@ -12,23 +12,23 @@ SkSVGPresentationAttributes::SkSVGPresentationAttributes() : fFillIsSet(false) , fStrokeIsSet(false) { } -void SkSVGPresentationAttributes::setFill(const SkSVGColor& c) { +void SkSVGPresentationAttributes::setFill(const SkSVGColorType& c) { fFill = c; fFillIsSet = true; } -void SkSVGPresentationAttributes::setStroke(const SkSVGColor& c) { +void SkSVGPresentationAttributes::setStroke(const SkSVGColorType& c) { fStroke = c; fStrokeIsSet = true; } -void SkSVGPresentationAttributes::applyTo(SkTCopyOnFirstWrite<SkSVGRenderContext>& ctx) const { +void SkSVGPresentationAttributes::applyTo(SkSVGRenderContext* ctx) const { if (fFillIsSet) { - ctx.writable()->setFillColor(fFill); + ctx->writablePresentationContext()->setFillColor(fFill); } if (fStrokeIsSet) { - ctx.writable()->setStrokeColor(fStroke); + ctx->writablePresentationContext()->setStrokeColor(fStroke); } } |