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 /src/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 'src/svg')
| -rw-r--r-- | src/svg/SkSVGCanvas.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/svg/SkSVGCanvas.cpp b/src/svg/SkSVGCanvas.cpp index d3511c031f..95a4625417 100644 --- a/src/svg/SkSVGCanvas.cpp +++ b/src/svg/SkSVGCanvas.cpp @@ -7,11 +7,12 @@ #include "SkSVGCanvas.h" #include "SkSVGDevice.h" +#include "SkMakeUnique.h" -SkCanvas* SkSVGCanvas::Create(const SkRect& bounds, SkXMLWriter* writer) { +std::unique_ptr<SkCanvas> SkSVGCanvas::Make(const SkRect& bounds, SkXMLWriter* writer) { // TODO: pass full bounds to the device SkISize size = bounds.roundOut().size(); sk_sp<SkBaseDevice> device(SkSVGDevice::Create(size, writer)); - return new SkCanvas(device.get()); + return skstd::make_unique<SkCanvas>(device.get()); } |