From b613c266df48cf45296ecc23d1bd7098c84bb7ba Mon Sep 17 00:00:00 2001 From: Heather Miller Date: Thu, 10 Nov 2016 21:25:30 +0000 Subject: Revert "Change SkCanvas to *not* inherit from SkRefCnt" This reverts commit 824075071885b6b741c141cbe2134d8345d34589. Reason for revert: Breaking WebView (chromium:663959) Original change's description: > Change SkCanvas to *not* inherit from SkRefCnt > > Definitely tricky for classes like SkNWayCanvas, where the caller (today) > need not pay attention to ownership of the canvases it gave the NWay > (after this CL, the caller *must* managed ownership) > > BUG=skia: > > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4441 > > DOCS_PREVIEW= https://skia.org/?cl=4441 > > Change-Id: Ib1ac07a3cdf0686d78e7aaa4735d45cc90bea081 > Reviewed-on: https://skia-review.googlesource.com/4441 > Commit-Queue: Mike Reed > Reviewed-by: Florin Malita > Reviewed-by: Robert Phillips > TBR=djsollen@google.com,mtklein@google.com,halcanary@google.com,robertphillips@google.com,fmalita@chromium.org,fmalita@google.com,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I5e3b3e876b7d2c09833cf841801321033b6b968b Reviewed-on: https://skia-review.googlesource.com/4687 Commit-Queue: Heather Miller Reviewed-by: Heather Miller --- src/svg/SkSVGCanvas.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/svg') diff --git a/src/svg/SkSVGCanvas.cpp b/src/svg/SkSVGCanvas.cpp index 95a4625417..d3511c031f 100644 --- a/src/svg/SkSVGCanvas.cpp +++ b/src/svg/SkSVGCanvas.cpp @@ -7,12 +7,11 @@ #include "SkSVGCanvas.h" #include "SkSVGDevice.h" -#include "SkMakeUnique.h" -std::unique_ptr SkSVGCanvas::Make(const SkRect& bounds, SkXMLWriter* writer) { +SkCanvas* SkSVGCanvas::Create(const SkRect& bounds, SkXMLWriter* writer) { // TODO: pass full bounds to the device SkISize size = bounds.roundOut().size(); sk_sp device(SkSVGDevice::Create(size, writer)); - return skstd::make_unique(device.get()); + return new SkCanvas(device.get()); } -- cgit v1.2.3