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/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;
};