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/codec/SkIcoCodec.h | |
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/codec/SkIcoCodec.h')
-rw-r--r-- | src/codec/SkIcoCodec.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/codec/SkIcoCodec.h b/src/codec/SkIcoCodec.h index b9ed823a3a..0c4e504a19 100644 --- a/src/codec/SkIcoCodec.h +++ b/src/codec/SkIcoCodec.h @@ -77,16 +77,16 @@ private: * @param embeddedCodecs codecs for the embedded images, takes ownership */ SkIcoCodec(int width, int height, const SkEncodedInfo& info, - SkTArray<SkAutoTDelete<SkCodec>, true>* embeddedCodecs, sk_sp<SkColorSpace> colorSpace); + SkTArray<std::unique_ptr<SkCodec>, true>* embeddedCodecs, sk_sp<SkColorSpace> colorSpace); - SkAutoTDelete<SkTArray<SkAutoTDelete<SkCodec>, true>> fEmbeddedCodecs; // owned + std::unique_ptr<SkTArray<std::unique_ptr<SkCodec>, true>> fEmbeddedCodecs; // Only used by the scanline decoder. onStartScanlineDecode() will set // fCurrScanlineCodec to one of the fEmbeddedCodecs, if it can find a // codec of the appropriate size. We will use fCurrScanlineCodec for // subsequent calls to onGetScanlines() or onSkipScanlines(). // fCurrScanlineCodec is owned by this class, but should not be an - // SkAutoTDelete. It will be deleted by the destructor of fEmbeddedCodecs. + // std::unique_ptr. It will be deleted by the destructor of fEmbeddedCodecs. SkCodec* fCurrScanlineCodec; // Only used by incremental decoder. onStartIncrementalDecode() will set @@ -94,7 +94,7 @@ private: // codec of the appropriate size. We will use fCurrIncrementalCodec for // subsequent calls to incrementalDecode(). // fCurrIncrementalCodec is owned by this class, but should not be an - // SkAutoTDelete. It will be deleted by the destructor of fEmbeddedCodecs. + // std::unique_ptr. It will be deleted by the destructor of fEmbeddedCodecs. SkCodec* fCurrIncrementalCodec; typedef SkCodec INHERITED; |