diff options
| author |  fmalita <fmalita@chromium.org> | 2016-09-14 12:04:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-14 12:04:30 -0700 |
| commit | e1baa7c105dad0f301ce34e5d6d1aa329334ef8c (patch) | |
| tree | c79b25d4ed835bffccd2cbac9a6da433f1e51245 /experimental/svg/model/SkSVGDOM.h | |
| parent | be362774f9b9e8964544a579281603ed995e6e5a (diff) | |
[SVGDom] Expose intrinsic size info
* expose intrinsic size info on <svg> 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
Diffstat (limited to 'experimental/svg/model/SkSVGDOM.h')
| -rw-r--r-- | experimental/svg/model/SkSVGDOM.h | 10 |
1 files changed, 7 insertions, 3 deletions
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<SkSVGDOM> MakeFromDOM(const SkDOM&, const SkSize& containerSize); - static sk_sp<SkSVGDOM> MakeFromStream(SkStream&, const SkSize& containerSize); + static sk_sp<SkSVGDOM> MakeFromDOM(const SkDOM&); + static sk_sp<SkSVGDOM> MakeFromStream(SkStream&); + const SkSize& containerSize() const; void setContainerSize(const SkSize&); + void setRoot(sk_sp<SkSVGNode>); void render(SkCanvas*) const; private: + SkSize intrinsicSize() const; + SkSize fContainerSize; sk_sp<SkSVGNode> fRoot; SkSVGIDMapper fIDMapper; |