aboutsummaryrefslogtreecommitdiffhomepage
path: root/experimental/svg/model/SkSVGRect.cpp
diff options
context:
space:
mode:
authorGravatar fmalita <fmalita@chromium.org>2016-08-08 11:38:55 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-08-08 11:38:55 -0700
commit397a517d1a5774653fcdd08172f9a6b5eea67621 (patch)
treeab9c9aaa4121a8033a29f259401bcecf7d178203 /experimental/svg/model/SkSVGRect.cpp
parentf621ff49a288978c272d5ae069a6a1c04c74642b (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/SkSVGRect.cpp')
-rw-r--r--experimental/svg/model/SkSVGRect.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/experimental/svg/model/SkSVGRect.cpp b/experimental/svg/model/SkSVGRect.cpp
index 288fc48258..b65c2b9974 100644
--- a/experimental/svg/model/SkSVGRect.cpp
+++ b/experimental/svg/model/SkSVGRect.cpp
@@ -58,11 +58,5 @@ void SkSVGRect::onSetAttribute(SkSVGAttribute attr, const SkSVGValue& v) {
void SkSVGRect::onDraw(SkCanvas* canvas, const SkSVGLengthContext& lctx,
const SkPaint& paint) const {
- const SkRect r = SkRect::MakeXYWH(
- lctx.resolve(fX, SkSVGLengthContext::LengthType::kHorizontal),
- lctx.resolve(fY, SkSVGLengthContext::LengthType::kVertical),
- lctx.resolve(fWidth, SkSVGLengthContext::LengthType::kHorizontal),
- lctx.resolve(fHeight, SkSVGLengthContext::LengthType::kVertical));
-
- canvas->drawRect(r, paint);
+ canvas->drawRect(lctx.resolveRect(fX, fY, fWidth, fHeight), paint);
}