diff options
| author |  Ben Wagner <bungeman@google.com> | 2016-11-03 14:40:50 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-03 19:03:40 +0000 |
| commit | 145dbcd165d9d27298eb8888bc240e2d06a95464 (patch) | |
| tree | 461ac2a3fe607bdf1d72fd72ae9451a58490a1bc /samplecode | |
| parent | b1c7f88df9ec40b4efb52d314304adfbaf95697c (diff) | |
Remove SkAutoTDelete.
Replace with std::unique_ptr.
Change-Id: I5806cfbb30515fcb20e5e66ce13fb5f3b8728176
Reviewed-on: https://skia-review.googlesource.com/4381
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/DecodeFile.h | 2 | ||||
| -rw-r--r-- | samplecode/SampleApp.h | 2 | ||||
| -rw-r--r-- | samplecode/SamplePdfFileViewer.cpp | 2 | ||||
| -rw-r--r-- | samplecode/SamplePictFile.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/DecodeFile.h b/samplecode/DecodeFile.h index b954af6331..95f3e39983 100644 --- a/samplecode/DecodeFile.h +++ b/samplecode/DecodeFile.h @@ -15,7 +15,7 @@ static inline bool decode_file(const char* filename, SkBitmap* bitmap, bool requireUnpremul = false) { SkASSERT(kIndex_8_SkColorType != colorType); sk_sp<SkData> data(SkData::MakeFromFileName(filename)); - SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(data)); + std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(data)); if (!codec) { return false; } diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h index 3011f5f757..c52541d409 100644 --- a/samplecode/SampleApp.h +++ b/samplecode/SampleApp.h @@ -175,7 +175,7 @@ private: SkPipeDeserializer fPipeDeserializer; SkPictureRecorder fRecorder; - SkAutoTDelete<SkCanvas> fFlagsFilterCanvas; + std::unique_ptr<SkCanvas> fFlagsFilterCanvas; SkPath fClipPath; SkTouchGesture fGesture; diff --git a/samplecode/SamplePdfFileViewer.cpp b/samplecode/SamplePdfFileViewer.cpp index a36b29f42f..110aa5876c 100644 --- a/samplecode/SamplePdfFileViewer.cpp +++ b/samplecode/SamplePdfFileViewer.cpp @@ -36,7 +36,7 @@ private: SkPicture* fPicture; // TODO(edisonn): multiple pages, one page / picture, make it an array static SkPicture* LoadPdf(const char path[]) { - SkAutoTDelete<SkPdfRenderer> renderer(SkPdfRenderer::CreateFromFile(path)); + std::unique_ptr<SkPdfRenderer> renderer(SkPdfRenderer::CreateFromFile(path)); if (nullptr == renderer.get()) { return nullptr; } diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp index 85483288c7..a826edd14f 100644 --- a/samplecode/SamplePictFile.cpp +++ b/samplecode/SamplePictFile.cpp @@ -199,7 +199,7 @@ private: return nullptr; } - SkAutoTDelete<SkBBHFactory> factory; + std::unique_ptr<SkBBHFactory> factory; switch (bbox) { case kNo_BBoxType: // no bbox playback necessary |