From 5df4934b3e40cdc378e225d1dda39f015cae9bae Mon Sep 17 00:00:00 2001
From: Mike Reed <reed@google.com>
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 <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
---
 tools/skiaserve/Request.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/skiaserve')

diff --git a/tools/skiaserve/Request.h b/tools/skiaserve/Request.h
index 6b065a2bf8..4058d7ce7e 100644
--- a/tools/skiaserve/Request.h
+++ b/tools/skiaserve/Request.h
@@ -63,7 +63,7 @@ struct Request {
     SkColor getPixel(int x, int y);
 
     UploadContext* fUploadContext;
-    sk_sp<SkDebugCanvas> fDebugCanvas;
+    std::unique_ptr<SkDebugCanvas> fDebugCanvas;
     UrlDataManager fUrlDataManager;
 
 private:
-- 
cgit v1.2.3