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

7 files changed, 11 insertions, 10 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);
         }
     }