diff options
29 files changed, 43 insertions, 42 deletions
diff --git a/bench/AndroidCodecBench.cpp b/bench/AndroidCodecBench.cpp index 97e1176044..6443ce69b7 100644 --- a/bench/AndroidCodecBench.cpp +++ b/bench/AndroidCodecBench.cpp @@ -29,7 +29,7 @@ bool AndroidCodecBench::isSuitableFor(Backend backend) { } void AndroidCodecBench::onDelayedSetup() { - SkAutoTDelete<SkAndroidCodec> codec(SkAndroidCodec::NewFromData(fData)); + SkAutoTDelete<SkAndroidCodec> codec(SkAndroidCodec::NewFromData(fData.get())); SkISize scaledSize = codec->getSampledDimensions(fSampleSize); fInfo = codec->getInfo().makeWH(scaledSize.width(), scaledSize.height()) @@ -46,7 +46,7 @@ void AndroidCodecBench::onDraw(int n, SkCanvas* canvas) { SkAndroidCodec::AndroidOptions options; options.fSampleSize = fSampleSize; for (int i = 0; i < n; i++) { - codec.reset(SkAndroidCodec::NewFromData(fData)); + codec.reset(SkAndroidCodec::NewFromData(fData.get())); #ifdef SK_DEBUG const SkCodec::Result result = #endif diff --git a/bench/AndroidCodecBench.h b/bench/AndroidCodecBench.h index fdbec5258a..8cdd7fec04 100644 --- a/bench/AndroidCodecBench.h +++ b/bench/AndroidCodecBench.h @@ -30,7 +30,7 @@ protected: private: SkString fName; - SkAutoTUnref<SkData> fData; + sk_sp<SkData> fData; const int fSampleSize; SkImageInfo fInfo; // Set in onDelayedSetup. SkAutoMalloc fPixelStorage; // Set in onDelayedSetup. diff --git a/bench/BitmapRegionDecoderBench.cpp b/bench/BitmapRegionDecoderBench.cpp index dd60b18296..709ad0e89d 100644 --- a/bench/BitmapRegionDecoderBench.cpp +++ b/bench/BitmapRegionDecoderBench.cpp @@ -36,7 +36,8 @@ bool BitmapRegionDecoderBench::isSuitableFor(Backend backend) { } void BitmapRegionDecoderBench::onDelayedSetup() { - fBRD.reset(SkBitmapRegionDecoder::Create(fData, SkBitmapRegionDecoder::kAndroidCodec_Strategy)); + fBRD.reset(SkBitmapRegionDecoder::Create(fData.get(), + SkBitmapRegionDecoder::kAndroidCodec_Strategy)); } void BitmapRegionDecoderBench::onDraw(int n, SkCanvas* canvas) { diff --git a/bench/BitmapRegionDecoderBench.h b/bench/BitmapRegionDecoderBench.h index 69588b24c3..2fb56ad2c9 100644 --- a/bench/BitmapRegionDecoderBench.h +++ b/bench/BitmapRegionDecoderBench.h @@ -36,7 +36,7 @@ protected: private: SkString fName; SkAutoTDelete<SkBitmapRegionDecoder> fBRD; - SkAutoTUnref<SkData> fData; + sk_sp<SkData> fData; const SkColorType fColorType; const uint32_t fSampleSize; const SkIRect fSubset; diff --git a/bench/CodecBench.cpp b/bench/CodecBench.cpp index 9bd404db55..e3bf1ccb22 100644 --- a/bench/CodecBench.cpp +++ b/bench/CodecBench.cpp @@ -26,7 +26,7 @@ CodecBench::CodecBench(SkString baseName, SkData* encoded, SkColorType colorType alpha_type_to_str(alphaType)); #ifdef SK_DEBUG // Ensure that we can create an SkCodec from this data. - SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(fData)); + SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(fData.get())); SkASSERT(codec); #endif } @@ -40,7 +40,7 @@ bool CodecBench::isSuitableFor(Backend backend) { } void CodecBench::onDelayedSetup() { - SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(fData)); + SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(fData.get())); fInfo = codec->getInfo().makeColorType(fColorType) .makeAlphaType(fAlphaType) @@ -59,7 +59,7 @@ void CodecBench::onDraw(int n, SkCanvas* canvas) { } for (int i = 0; i < n; i++) { colorCount = 256; - codec.reset(SkCodec::NewFromData(fData)); + codec.reset(SkCodec::NewFromData(fData.get())); #ifdef SK_DEBUG const SkCodec::Result result = #endif diff --git a/bench/CodecBench.h b/bench/CodecBench.h index b465eae36a..5b4db24004 100644 --- a/bench/CodecBench.h +++ b/bench/CodecBench.h @@ -32,7 +32,7 @@ private: SkString fName; const SkColorType fColorType; const SkAlphaType fAlphaType; - SkAutoTUnref<SkData> fData; + sk_sp<SkData> fData; SkImageInfo fInfo; // Set in onDelayedSetup. SkAutoMalloc fPixelStorage; typedef Benchmark INHERITED; diff --git a/bench/EncoderBench.cpp b/bench/EncoderBench.cpp index 8a82a7cf06..d7ddfbc602 100644 --- a/bench/EncoderBench.cpp +++ b/bench/EncoderBench.cpp @@ -54,7 +54,7 @@ public: void onDraw(int loops, SkCanvas*) override { for (int i = 0; i < loops; i++) { - SkAutoTUnref<SkData> data(SkImageEncoder::EncodeData(fBitmap, fType, fQuality)); + sk_sp<SkData> data(SkImageEncoder::EncodeData(fBitmap, fType, fQuality)); SkASSERT(data); } } diff --git a/fuzz/FilterFuzz.cpp b/fuzz/FilterFuzz.cpp index 3255b4be4c..6b766a2b7c 100644 --- a/fuzz/FilterFuzz.cpp +++ b/fuzz/FilterFuzz.cpp @@ -734,7 +734,7 @@ static sk_sp<SkImageFilter> make_image_filter(bool canBeNull) { static SkImageFilter* make_serialized_image_filter() { sk_sp<SkImageFilter> filter(make_image_filter(false)); - SkAutoTUnref<SkData> data(SkValidatingSerializeFlattenable(filter.get())); + sk_sp<SkData> data(SkValidatingSerializeFlattenable(filter.get())); const unsigned char* ptr = static_cast<const unsigned char*>(data->data()); size_t len = data->size(); #ifdef SK_ADD_RANDOM_BIT_FLIPS diff --git a/fuzz/Fuzz.h b/fuzz/Fuzz.h index 79bf675f45..16a7f98d4e 100644 --- a/fuzz/Fuzz.h +++ b/fuzz/Fuzz.h @@ -47,7 +47,7 @@ private: template <typename T> T nextT(); - SkAutoTUnref<SkData> fBytes; + sk_sp<SkData> fBytes; int fNextByte; }; diff --git a/gm/image.cpp b/gm/image.cpp index b57ec3a687..a67ed202db 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -349,14 +349,14 @@ static SkImageGenerator* gen_picture(const SkImageInfo& info) { static SkImageGenerator* gen_png(const SkImageInfo& info) { sk_sp<SkImage> image(make_raster(info, nullptr, draw_opaque_contents)); - SkAutoTUnref<SkData> data(image->encode(SkImageEncoder::kPNG_Type, 100)); - return SkImageGenerator::NewFromEncoded(data); + sk_sp<SkData> data(image->encode(SkImageEncoder::kPNG_Type, 100)); + return SkImageGenerator::NewFromEncoded(data.get()); } static SkImageGenerator* gen_jpg(const SkImageInfo& info) { sk_sp<SkImage> image(make_raster(info, nullptr, draw_opaque_contents)); - SkAutoTUnref<SkData> data(image->encode(SkImageEncoder::kJPEG_Type, 100)); - return SkImageGenerator::NewFromEncoded(data); + sk_sp<SkData> data(image->encode(SkImageEncoder::kJPEG_Type, 100)); + return SkImageGenerator::NewFromEncoded(data.get()); } typedef SkImageGenerator* (*GeneratorMakerProc)(const SkImageInfo&); diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index 7a53f4f18e..755e8fb458 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -738,7 +738,7 @@ static sk_sp<SkImageFilter> make_image_filter(bool canBeNull) { static SkImageFilter* make_serialized_image_filter() { sk_sp<SkImageFilter> filter(make_image_filter(false)); - SkAutoTUnref<SkData> data(SkValidatingSerializeFlattenable(filter.get())); + sk_sp<SkData> data(SkValidatingSerializeFlattenable(filter.get())); const unsigned char* ptr = static_cast<const unsigned char*>(data->data()); size_t len = data->size(); #ifdef SK_ADD_RANDOM_BIT_FLIPS diff --git a/src/codec/SkCodecImageGenerator.h b/src/codec/SkCodecImageGenerator.h index 6d34223110..b12564329d 100644 --- a/src/codec/SkCodecImageGenerator.h +++ b/src/codec/SkCodecImageGenerator.h @@ -38,7 +38,7 @@ private: SkCodecImageGenerator(SkCodec* codec, SkData* data); SkAutoTDelete<SkCodec> fCodec; - SkAutoTUnref<SkData> fData; + sk_sp<SkData> fData; typedef SkImageGenerator INHERITED; }; diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp index b4101f15c7..496ca74d9a 100644 --- a/src/core/SkImageCacherator.cpp +++ b/src/core/SkImageCacherator.cpp @@ -288,7 +288,7 @@ GrTexture* SkImageCacherator::lockTexture(GrContext* ctx, const GrUniqueKey& key #ifdef SK_SUPPORT_COMPRESSED_TEXTURES_IN_CACHERATOR // 3. Ask the generator to return a compressed form that the GPU might support - SkAutoTUnref<SkData> data(this->refEncoded(ctx)); + sk_sp<SkData> data(this->refEncoded(ctx)); if (data) { GrTexture* tex = load_compressed_into_texture(ctx, data, desc); if (tex) { diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp index d85376a118..776e337ff4 100644 --- a/src/core/SkPictureRecord.cpp +++ b/src/core/SkPictureRecord.cpp @@ -904,10 +904,10 @@ static bool equivalent(const SkBitmap& a, const SkBitmap& b) { } // If the bitmaps have encoded data, check first before locking pixels so they don't decode. - SkAutoTUnref<SkData> encA(a.pixelRef()->refEncodedData()), - encB(b.pixelRef()->refEncodedData()); + sk_sp<SkData> encA(a.pixelRef()->refEncodedData()), + encB(b.pixelRef()->refEncodedData()); if (encA && encB) { - return encA->equals(encB); + return encA->equals(encB.get()); } else if (encA || encB) { return false; // One has encoded data but the other does not. } diff --git a/src/core/SkWriteBuffer.cpp b/src/core/SkWriteBuffer.cpp index e954399b09..33ac03b49d 100644 --- a/src/core/SkWriteBuffer.cpp +++ b/src/core/SkWriteBuffer.cpp @@ -176,9 +176,9 @@ void SkBinaryWriteBuffer::writeImage(const SkImage* image) { this->writeInt(image->width()); this->writeInt(image->height()); - SkAutoTUnref<SkData> encoded(image->encode(this->getPixelSerializer())); + sk_sp<SkData> encoded(image->encode(this->getPixelSerializer())); if (encoded && encoded->size() > 0) { - write_encoded_bitmap(this, encoded, SkIPoint::Make(0, 0)); + write_encoded_bitmap(this, encoded.get(), SkIPoint::Make(0, 0)); return; } diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 7a5726f950..3d6d4ec8bf 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -198,13 +198,13 @@ static sk_sp<GrTexture> create_texture_from_yuv(GrContext* ctx, const SkBitmap& } static GrTexture* load_etc1_texture(GrContext* ctx, const SkBitmap &bm, GrSurfaceDesc desc) { - SkAutoTUnref<SkData> data(bm.pixelRef()->refEncodedData()); + sk_sp<SkData> data(bm.pixelRef()->refEncodedData()); if (!data) { return nullptr; } const void* startOfTexData; - desc.fConfig = GrIsCompressedTextureDataSupported(ctx, data, bm.width(), bm.height(), + desc.fConfig = GrIsCompressedTextureDataSupported(ctx, data.get(), bm.width(), bm.height(), &startOfTexData); if (kUnknown_GrPixelConfig == desc.fConfig) { return nullptr; diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 8e4640755c..15c5ea6bd8 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -134,7 +134,7 @@ SkData* SkImage::encode(SkPixelSerializer* serializer) const { SkASSERT(defaultSerializer.get()); effectiveSerializer = defaultSerializer.get(); } - SkAutoTUnref<SkData> encoded(this->refEncoded()); + sk_sp<SkData> encoded(this->refEncoded()); if (encoded && effectiveSerializer->useEncodedData(encoded->data(), encoded->size())) { return encoded.release(); } diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index 6cce96c1f7..c795d54fcb 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -440,7 +440,7 @@ size_t SkImage::getDeferredTextureImageData(const GrContextThreadSafeProxy& prox // Here we're just using presence of data to know whether there is a codec behind the image. // In the future we will access the cacherator and get the exact data that we want to (e.g. // yuv planes) upload. - SkAutoTUnref<SkData> data(this->refEncoded()); + sk_sp<SkData> data(this->refEncoded()); if (!data && !this->peekPixels(nullptr)) { return 0; } diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index aa6a3ce341..fa5c9722b8 100644 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -1930,7 +1930,7 @@ static SkTypeface* create_from_stream(SkStreamAsset* stream) { } // Change the name of the font. - SkAutoTUnref<SkData> rewrittenFontData(SkOTUtils::RenameFont(stream, familyName, familyNameSize-1)); + sk_sp<SkData> rewrittenFontData(SkOTUtils::RenameFont(stream, familyName, familyNameSize-1)); if (nullptr == rewrittenFontData.get()) { return nullptr; } diff --git a/src/ports/SkImageGeneratorCG.h b/src/ports/SkImageGeneratorCG.h index 53102eaf8c..baf3669ffc 100644 --- a/src/ports/SkImageGeneratorCG.h +++ b/src/ports/SkImageGeneratorCG.h @@ -35,7 +35,7 @@ private: SkImageGeneratorCG(const SkImageInfo& info, const void* imageSrc, SkData* data); SkAutoTCallVProc<const void, CFRelease> fImageSrc; - SkAutoTUnref<SkData> fData; + sk_sp<SkData> fData; typedef SkImageGenerator INHERITED; }; diff --git a/src/ports/SkImageGeneratorWIC.h b/src/ports/SkImageGeneratorWIC.h index 6f661ef695..76cb6df1a3 100644 --- a/src/ports/SkImageGeneratorWIC.h +++ b/src/ports/SkImageGeneratorWIC.h @@ -55,7 +55,7 @@ private: SkTScopedComPtr<IWICImagingFactory> fImagingFactory; SkTScopedComPtr<IWICBitmapSource> fImageSource; - SkAutoTUnref<SkData> fData; + sk_sp<SkData> fData; typedef SkImageGenerator INHERITED; }; diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index 7e1b594791..a5df7e3b50 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -823,8 +823,8 @@ DEF_TEST(Codec_pngChunkReader, r) { ChunkReader chunkReader(r); // Now read the file with SkCodec. - SkAutoTUnref<SkData> data(wStream.copyToData()); - SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(data, &chunkReader)); + sk_sp<SkData> data(wStream.copyToData()); + SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(data.get(), &chunkReader)); REPORTER_ASSERT(r, codec); if (!codec) { return; diff --git a/tests/PDFJpegEmbedTest.cpp b/tests/PDFJpegEmbedTest.cpp index 6b10f04932..b199c80e75 100644 --- a/tests/PDFJpegEmbedTest.cpp +++ b/tests/PDFJpegEmbedTest.cpp @@ -76,7 +76,7 @@ DEF_TEST(PDFJpegEmbedTest, r) { canvas->flush(); document->endPage(); document->close(); - SkAutoTUnref<SkData> pdfData(pdf.copyToData()); + sk_sp<SkData> pdfData(pdf.copyToData()); SkASSERT(pdfData); pdf.reset(); diff --git a/tests/PDFMetadataAttributeTest.cpp b/tests/PDFMetadataAttributeTest.cpp index 2d43d30d7c..6e7cc248d3 100644 --- a/tests/PDFMetadataAttributeTest.cpp +++ b/tests/PDFMetadataAttributeTest.cpp @@ -29,7 +29,7 @@ DEF_TEST(SkPDF_Metadata, r) { metadata, nullptr, false); doc->beginPage(612.0f, 792.0f); doc->close(); - SkAutoTUnref<SkData> data(pdf.copyToData()); + sk_sp<SkData> data(pdf.copyToData()); static const char* expectations[] = { "/Title (A1)", "/Author (A2)", diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp index 50523ff317..56977822b9 100644 --- a/tests/StreamTest.cpp +++ b/tests/StreamTest.cpp @@ -117,7 +117,7 @@ static void TestWStream(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, ds.getOffset() == 100 * 26); { - SkAutoTUnref<SkData> data(ds.copyToData()); + sk_sp<SkData> data(ds.copyToData()); REPORTER_ASSERT(reporter, 100 * 26 == data->size()); REPORTER_ASSERT(reporter, memcmp(dst, data->data(), data->size()) == 0); } @@ -404,7 +404,7 @@ static void stream_copy_test(skiatest::Reporter* reporter, ERRORF(reporter, "SkStreamCopy failed"); return; } - SkAutoTUnref<SkData> data(tgt.copyToData()); + sk_sp<SkData> data(tgt.copyToData()); tgt.reset(); if (data->size() != N) { ERRORF(reporter, "SkStreamCopy incorrect size"); diff --git a/third_party/ktx/ktx.h b/third_party/ktx/ktx.h index 6ff8a8bd37..f06613d71b 100644 --- a/third_party/ktx/ktx.h +++ b/third_party/ktx/ktx.h @@ -69,7 +69,7 @@ public: private: // The blob holding the file data. - SkAutoTUnref<SkData> fData; + sk_sp<SkData> fData; // This header captures all of the data that describes the format // of the image data in a KTX file. diff --git a/tools/UrlDataManager.h b/tools/UrlDataManager.h index b047edacbc..49646ca607 100644 --- a/tools/UrlDataManager.h +++ b/tools/UrlDataManager.h @@ -33,7 +33,7 @@ public: struct UrlData : public SkRefCnt { SkString fUrl; SkString fContentType; - SkAutoTUnref<SkData> fData; + sk_sp<SkData> fData; }; /* diff --git a/tools/skiaserve/urlhandlers/BreakHandler.cpp b/tools/skiaserve/urlhandlers/BreakHandler.cpp index 16bf507297..7766adb021 100644 --- a/tools/skiaserve/urlhandlers/BreakHandler.cpp +++ b/tools/skiaserve/urlhandlers/BreakHandler.cpp @@ -80,6 +80,6 @@ int BreakHandler::handle(Request* request, MHD_Connection* connection, canvas->restoreToCount(saveCount); SkDynamicMemoryWStream stream; stream.writeText(Json::FastWriter().write(response).c_str()); - SkAutoTUnref<SkData> data(stream.copyToData()); - return SendData(connection, data, "application/json"); + sk_sp<SkData> data(stream.copyToData()); + return SendData(connection, data.get(), "application/json"); } diff --git a/tools/visualize_color_gamut.cpp b/tools/visualize_color_gamut.cpp index 424106f9c4..3da1e3c936 100644 --- a/tools/visualize_color_gamut.cpp +++ b/tools/visualize_color_gamut.cpp @@ -159,7 +159,7 @@ int main(int argc, char** argv) { draw_gamut(&canvas, colorSpace->xyz(), input, 0xFF000000, true); // Finally, encode the result to the output file. - SkAutoTUnref<SkData> out(SkImageEncoder::EncodeData(gamut, SkImageEncoder::kPNG_Type, 100)); + sk_sp<SkData> out(SkImageEncoder::EncodeData(gamut, SkImageEncoder::kPNG_Type, 100)); if (!out) { SkDebugf("Failed to encode gamut output.\n"); return -1; |