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/core/SkPicture.cpp | |
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/core/SkPicture.cpp')
-rw-r--r-- | src/core/SkPicture.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index ae3b70452e..039efc85c7 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -171,9 +171,9 @@ sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream, SkImageDeserializer if (!InternalOnly_StreamIsSKP(stream, &info) || !stream->readBool()) { return nullptr; } - SkAutoTDelete<SkPictureData> data( + std::unique_ptr<SkPictureData> data( SkPictureData::CreateFromStream(stream, info, factory, typefaces)); - return Forwardport(info, data, nullptr); + return Forwardport(info, data.get(), nullptr); } sk_sp<SkPicture> SkPicture::MakeFromBuffer(SkReadBuffer& buffer) { @@ -181,8 +181,8 @@ sk_sp<SkPicture> SkPicture::MakeFromBuffer(SkReadBuffer& buffer) { if (!InternalOnly_BufferIsSKP(&buffer, &info) || !buffer.readBool()) { return nullptr; } - SkAutoTDelete<SkPictureData> data(SkPictureData::CreateFromBuffer(buffer, info)); - return Forwardport(info, data, &buffer); + std::unique_ptr<SkPictureData> data(SkPictureData::CreateFromBuffer(buffer, info)); + return Forwardport(info, data.get(), &buffer); } SkPictureData* SkPicture::backport() const { @@ -208,7 +208,7 @@ void SkPicture::serialize(SkWStream* stream, SkPixelSerializer* pixelSerializer, SkRefCntSet* typefaceSet) const { SkPictInfo info = this->createHeader(); - SkAutoTDelete<SkPictureData> data(this->backport()); + std::unique_ptr<SkPictureData> data(this->backport()); stream->write(&info, sizeof(info)); if (data) { @@ -221,7 +221,7 @@ void SkPicture::serialize(SkWStream* stream, void SkPicture::flatten(SkWriteBuffer& buffer) const { SkPictInfo info = this->createHeader(); - SkAutoTDelete<SkPictureData> data(this->backport()); + std::unique_ptr<SkPictureData> data(this->backport()); buffer.writeByteArray(&info.fMagic, sizeof(info.fMagic)); buffer.writeUInt(info.getVersion()); |