diff options
| author |  Hal Canary <halcanary@google.com> | 2016-11-03 16:26:13 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-03 21:00:34 +0000 |
| commit | 1b612a89fba2275e3effe12bdc9b6cdc2f4d9eee (patch) | |
| tree | 9a1d89d5c6499ce60f3b109f1a03e46ce33e6390 /tools/skiaserve | |
| parent | 1b96c6f91377431cd407c43fedac613fff21c2ed (diff) | |
tools: s/SkAutoTUnref/sk_sp/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4391
Change-Id: Iae8b032b00d3579c77f3b86370dde71c4649da45
Reviewed-on: https://skia-review.googlesource.com/4391
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'tools/skiaserve')
| -rw-r--r-- | tools/skiaserve/Request.cpp | 6 | ||||
| -rw-r--r-- | tools/skiaserve/Request.h | 4 | ||||
| -rw-r--r-- | tools/skiaserve/urlhandlers/DataHandler.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp index 134fdf03c2..c1b3b25cdd 100644 --- a/tools/skiaserve/Request.cpp +++ b/tools/skiaserve/Request.cpp @@ -117,8 +117,8 @@ sk_sp<SkData> Request::writeOutSkp() { SkDynamicMemoryWStream outStream; - SkAutoTUnref<SkPixelSerializer> serializer(SkImageEncoder::CreatePixelSerializer()); - picture->serialize(&outStream, serializer); + sk_sp<SkPixelSerializer> serializer(SkImageEncoder::CreatePixelSerializer()); + picture->serialize(&outStream, serializer.get()); return outStream.detachAsData(); } @@ -280,7 +280,7 @@ sk_sp<SkData> Request::getJsonBatchList(int n) { sk_sp<SkData> Request::getJsonInfo(int n) { // drawTo - SkAutoTUnref<SkSurface> surface(this->createCPUSurface()); + sk_sp<SkSurface> surface(this->createCPUSurface()); SkCanvas* canvas = surface->getCanvas(); // TODO this is really slow and we should cache the matrix and clip diff --git a/tools/skiaserve/Request.h b/tools/skiaserve/Request.h index cadf15c6ba..6b065a2bf8 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; - SkAutoTUnref<SkDebugCanvas> fDebugCanvas; + sk_sp<SkDebugCanvas> fDebugCanvas; UrlDataManager fUrlDataManager; private: @@ -76,7 +76,7 @@ private: sk_sp<SkPicture> fPicture; sk_gpu_test::GrContextFactory* fContextFactory; - SkAutoTUnref<SkSurface> fSurface; + sk_sp<SkSurface> fSurface; bool fGPUEnabled; bool fOverdraw; int fColorMode; diff --git a/tools/skiaserve/urlhandlers/DataHandler.cpp b/tools/skiaserve/urlhandlers/DataHandler.cpp index 397be8f224..83a9be4d12 100644 --- a/tools/skiaserve/urlhandlers/DataHandler.cpp +++ b/tools/skiaserve/urlhandlers/DataHandler.cpp @@ -29,7 +29,7 @@ int DataHandler::handle(Request* request, MHD_Connection* connection, return MHD_NO; } - SkAutoTUnref<UrlDataManager::UrlData> urlData( + sk_sp<UrlDataManager::UrlData> urlData( SkRef(request->fUrlDataManager.getDataFromUrl(SkString(url)))); if (urlData) { |