From e1baa7c105dad0f301ce34e5d6d1aa329334ef8c Mon Sep 17 00:00:00 2001 From: fmalita Date: Wed, 14 Sep 2016 12:04:30 -0700 Subject: [SVGDom] Expose intrinsic size info * expose intrinsic size info on nodes. * tweak the SkSVGDOM constructor to no longer take an container size param, but instead default to intrinsic size * update clients to call SkSVGDOM::setContainerSize() explicitly, when needed R=robertphillips@google.com,stephana@google.com GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2345533002 Review-Url: https://codereview.chromium.org/2345533002 --- experimental/svg/model/SkSVGDOM.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'experimental/svg/model/SkSVGDOM.h') diff --git a/experimental/svg/model/SkSVGDOM.h b/experimental/svg/model/SkSVGDOM.h index 9c59b7c561..8904c1799d 100644 --- a/experimental/svg/model/SkSVGDOM.h +++ b/experimental/svg/model/SkSVGDOM.h @@ -20,18 +20,22 @@ class SkSVGNode; class SkSVGDOM : public SkRefCnt { public: - SkSVGDOM(const SkSize& containerSize); + SkSVGDOM(); ~SkSVGDOM() = default; - static sk_sp MakeFromDOM(const SkDOM&, const SkSize& containerSize); - static sk_sp MakeFromStream(SkStream&, const SkSize& containerSize); + static sk_sp MakeFromDOM(const SkDOM&); + static sk_sp MakeFromStream(SkStream&); + const SkSize& containerSize() const; void setContainerSize(const SkSize&); + void setRoot(sk_sp); void render(SkCanvas*) const; private: + SkSize intrinsicSize() const; + SkSize fContainerSize; sk_sp fRoot; SkSVGIDMapper fIDMapper; -- cgit v1.2.3