diff options
| author |  Mike Reed <reed@google.com> | 2016-11-12 08:06:55 -0600 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-13 18:31:13 +0000 |
| commit | 5df4934b3e40cdc378e225d1dda39f015cae9bae (patch) | |
| tree | f0871dcbca35730333ad3b14115e6a14987fac7b /include/svg | |
| parent | f982cb37e3092e7a69c13a12ec09806ceff5af45 (diff) | |
Revert[2] "Change SkCanvas to *not* inherit from SkRefCnt"
Changes over original:
- conditionalize ownership in SkPictureRecorder
- conditionalize ownership in SkCanvasStateUtils
This reverts commit b613c266df48cf45296ecc23d1bd7098c84bb7ba.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4742
Change-Id: Ib25514d6f546c69b6650b5c957403b04f7380dc2
Reviewed-on: https://skia-review.googlesource.com/4742
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/svg')
| -rw-r--r-- | include/svg/SkSVGCanvas.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/svg/SkSVGCanvas.h b/include/svg/SkSVGCanvas.h index e285faa459..b72f273123 100644 --- a/include/svg/SkSVGCanvas.h +++ b/include/svg/SkSVGCanvas.h @@ -25,7 +25,13 @@ public: * The 'bounds' parameter defines an initial SVG viewport (viewBox attribute on the root * SVG element). */ - static SkCanvas* Create(const SkRect& bounds, SkXMLWriter*); + static std::unique_ptr<SkCanvas> Make(const SkRect& bounds, SkXMLWriter*); + +#ifdef SK_SUPPORT_LEGACY_CANVAS_IS_REFCNT + static SkCanvas* Create(const SkRect& bounds, SkXMLWriter* writer) { + return Make(bounds, writer).release(); + } +#endif }; #endif |