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 /src/android | |
| 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 'src/android')
| -rw-r--r-- | src/android/SkBitmapRegionCodec.h | 2 | ||||
| -rw-r--r-- | src/android/SkBitmapRegionDecoder.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/android/SkBitmapRegionCodec.h b/src/android/SkBitmapRegionCodec.h index 79774173b0..5c59d52d71 100644 --- a/src/android/SkBitmapRegionCodec.h +++ b/src/android/SkBitmapRegionCodec.h @@ -30,7 +30,7 @@ public: private: - SkAutoTDelete<SkAndroidCodec> fCodec; + std::unique_ptr<SkAndroidCodec> fCodec; typedef SkBitmapRegionDecoder INHERITED; diff --git a/src/android/SkBitmapRegionDecoder.cpp b/src/android/SkBitmapRegionDecoder.cpp index 6dd48c5f88..15a530e21a 100644 --- a/src/android/SkBitmapRegionDecoder.cpp +++ b/src/android/SkBitmapRegionDecoder.cpp @@ -19,11 +19,11 @@ SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create( SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create( SkStreamRewindable* stream, Strategy strategy) { - SkAutoTDelete<SkStreamRewindable> streamDeleter(stream); + std::unique_ptr<SkStreamRewindable> streamDeleter(stream); switch (strategy) { case kAndroidCodec_Strategy: { - SkAutoTDelete<SkAndroidCodec> codec = - SkAndroidCodec::NewFromStream(streamDeleter.release()); + std::unique_ptr<SkAndroidCodec> codec( + SkAndroidCodec::NewFromStream(streamDeleter.release())); if (nullptr == codec) { SkCodecPrintf("Error: Failed to create codec.\n"); return NULL; |