Convert SkAutoTUnref<SkData> to sk_sp<SkData>.
With the move from SkData::NewXXX to SkData::MakeXXX most
SkAutoTUnref<SkData> were changed to sk_sp<SkData>. However,
there are still a few SkAutoTUnref<SkData> around, so clean
them up.
Review-Url: https://codereview.chromium.org/2212493002
diff --git a/bench/AndroidCodecBench.cpp b/bench/AndroidCodecBench.cpp
index 97e1176..6443ce6 100644
--- a/bench/AndroidCodecBench.cpp
+++ b/bench/AndroidCodecBench.cpp
@@ -29,7 +29,7 @@
}
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 @@
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 fdbec52..8cdd7fe 100644
--- a/bench/AndroidCodecBench.h
+++ b/bench/AndroidCodecBench.h
@@ -30,7 +30,7 @@
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 dd60b18..709ad0e 100644
--- a/bench/BitmapRegionDecoderBench.cpp
+++ b/bench/BitmapRegionDecoderBench.cpp
@@ -36,7 +36,8 @@
}
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 69588b2..2fb56ad 100644
--- a/bench/BitmapRegionDecoderBench.h
+++ b/bench/BitmapRegionDecoderBench.h
@@ -36,7 +36,7 @@
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 9bd404d..e3bf1cc 100644
--- a/bench/CodecBench.cpp
+++ b/bench/CodecBench.cpp
@@ -26,7 +26,7 @@
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 @@
}
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 @@
}
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 b465eae..5b4db24 100644
--- a/bench/CodecBench.h
+++ b/bench/CodecBench.h
@@ -32,7 +32,7 @@
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 8a82a7c..d7ddfbc 100644
--- a/bench/EncoderBench.cpp
+++ b/bench/EncoderBench.cpp
@@ -54,7 +54,7 @@
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 3255b4b..6b766a2 100644
--- a/fuzz/FilterFuzz.cpp
+++ b/fuzz/FilterFuzz.cpp
@@ -734,7 +734,7 @@
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 79bf675..16a7f98 100644
--- a/fuzz/Fuzz.h
+++ b/fuzz/Fuzz.h
@@ -47,7 +47,7 @@
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 b57ec3a..a67ed20 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -349,14 +349,14 @@
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 7a53f4f..755e8fb 100644
--- a/samplecode/SampleFilterFuzz.cpp
+++ b/samplecode/SampleFilterFuzz.cpp
@@ -738,7 +738,7 @@
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 6d34223..b125643 100644
--- a/src/codec/SkCodecImageGenerator.h
+++ b/src/codec/SkCodecImageGenerator.h
@@ -38,7 +38,7 @@
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 b4101f1..496ca74 100644
--- a/src/core/SkImageCacherator.cpp
+++ b/src/core/SkImageCacherator.cpp
@@ -288,7 +288,7 @@
#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 d85376a..776e337 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -904,10 +904,10 @@
}
// 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 e954399..33ac03b 100644
--- a/src/core/SkWriteBuffer.cpp
+++ b/src/core/SkWriteBuffer.cpp
@@ -176,9 +176,9 @@
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 7a5726f..3d6d4ec 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -198,13 +198,13 @@
}
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 8e46407..15c5ea6 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -134,7 +134,7 @@
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 6cce96c..c795d54 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -440,7 +440,7 @@
// 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 aa6a3ce..fa5c972 100644
--- a/src/ports/SkFontHost_win.cpp
+++ b/src/ports/SkFontHost_win.cpp
@@ -1930,7 +1930,7 @@
}
// 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 53102ea..baf3669 100644
--- a/src/ports/SkImageGeneratorCG.h
+++ b/src/ports/SkImageGeneratorCG.h
@@ -35,7 +35,7 @@
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 6f661ef..76cb6df 100644
--- a/src/ports/SkImageGeneratorWIC.h
+++ b/src/ports/SkImageGeneratorWIC.h
@@ -55,7 +55,7 @@
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 7e1b594..a5df7e3 100644
--- a/tests/CodecTest.cpp
+++ b/tests/CodecTest.cpp
@@ -823,8 +823,8 @@
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 6b10f04..b199c80 100644
--- a/tests/PDFJpegEmbedTest.cpp
+++ b/tests/PDFJpegEmbedTest.cpp
@@ -76,7 +76,7 @@
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 2d43d30..6e7cc24 100644
--- a/tests/PDFMetadataAttributeTest.cpp
+++ b/tests/PDFMetadataAttributeTest.cpp
@@ -29,7 +29,7 @@
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 50523ff..5697782 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -117,7 +117,7 @@
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 @@
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 6ff8a8b..f06613d 100644
--- a/third_party/ktx/ktx.h
+++ b/third_party/ktx/ktx.h
@@ -69,7 +69,7 @@
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 b047eda..49646ca 100644
--- a/tools/UrlDataManager.h
+++ b/tools/UrlDataManager.h
@@ -33,7 +33,7 @@
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 16bf507..7766adb 100644
--- a/tools/skiaserve/urlhandlers/BreakHandler.cpp
+++ b/tools/skiaserve/urlhandlers/BreakHandler.cpp
@@ -80,6 +80,6 @@
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 424106f..3da1e3c 100644
--- a/tools/visualize_color_gamut.cpp
+++ b/tools/visualize_color_gamut.cpp
@@ -159,7 +159,7 @@
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;