From 5df4934b3e40cdc378e225d1dda39f015cae9bae Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Sat, 12 Nov 2016 08:06:55 -0600 Subject: 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 Commit-Queue: Mike Reed --- tools/skp_parser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/skp_parser.cpp') diff --git a/tools/skp_parser.cpp b/tools/skp_parser.cpp index d242524566..887c50d182 100644 --- a/tools/skp_parser.cpp +++ b/tools/skp_parser.cpp @@ -34,7 +34,7 @@ int main(int argc, char** argv) { SkISize size = pic->cullRect().roundOut().size(); SkDebugCanvas debugCanvas(size.width(), size.height()); pic->playback(&debugCanvas); - sk_sp nullCanvas(SkCreateNullCanvas()); + std::unique_ptr nullCanvas = SkMakeNullCanvas(); UrlDataManager dataManager(SkString("data")); Json::Value json = debugCanvas.toJSON( dataManager, debugCanvas.getSize(), nullCanvas.get()); -- cgit v1.2.3