use unique_ptr for codec factories

Will need guards for android (at least)

Bug: skia:
Change-Id: I2bb8e656997984489ef1f2e41cd3d301c4e7b947
Reviewed-on: https://skia-review.googlesource.com/26040
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

4 files changed, 9 insertions, 15 deletions

diff --git a/bench/AndroidCodecBench.cpp b/bench/AndroidCodecBench.cpp
index e0680bd9b4..d9abac63d8 100644
--- a/bench/AndroidCodecBench.cpp
+++ b/bench/AndroidCodecBench.cpp
@@ -29,7 +29,7 @@ bool AndroidCodecBench::isSuitableFor(Backend backend) {
 }
 
 void AndroidCodecBench::onDelayedSetup() {
-    std::unique_ptr<SkAndroidCodec> codec(SkAndroidCodec::NewFromData(fData));
+    std::unique_ptr<SkAndroidCodec> codec(SkAndroidCodec::MakeFromData(fData));
     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 = SkAndroidCodec::MakeFromData(fData);
 #ifdef SK_DEBUG
         const SkCodec::Result result =
 #endif
diff --git a/bench/CodecBench.cpp b/bench/CodecBench.cpp
index f72294e246..29443746f7 100644
--- a/bench/CodecBench.cpp
+++ b/bench/CodecBench.cpp
@@ -24,11 +24,8 @@ CodecBench::CodecBench(SkString baseName, SkData* encoded, SkColorType colorType
     // Parse filename and the color type to give the benchmark a useful name
     fName.printf("Codec_%s_%s%s", baseName.c_str(), color_type_to_str(colorType),
             alpha_type_to_str(alphaType));
-#ifdef SK_DEBUG
     // Ensure that we can create an SkCodec from this data.
-    std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(fData));
-    SkASSERT(codec);
-#endif
+    SkASSERT(SkCodec::MakeFromData(fData));
 }
 
 const char* CodecBench::onGetName() {
@@ -40,7 +37,7 @@ bool CodecBench::isSuitableFor(Backend backend) {
 }
 
 void CodecBench::onDelayedSetup() {
-    std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(fData));
+    std::unique_ptr<SkCodec> codec = SkCodec::MakeFromData(fData);
 
     fInfo = codec->getInfo().makeColorType(fColorType)
                             .makeAlphaType(fAlphaType)
@@ -56,7 +53,7 @@ void CodecBench::onDraw(int n, SkCanvas* canvas) {
         options.fZeroInitialized = SkCodec::kYes_ZeroInitialized;
     }
     for (int i = 0; i < n; i++) {
-        codec.reset(SkCodec::NewFromData(fData));
+        codec = SkCodec::MakeFromData(fData);
 #ifdef SK_DEBUG
         const SkCodec::Result result =
 #endif
diff --git a/bench/ColorCodecBench.cpp b/bench/ColorCodecBench.cpp
index 867b8a1418..680c1d916f 100644
--- a/bench/ColorCodecBench.cpp
+++ b/bench/ColorCodecBench.cpp
@@ -34,13 +34,10 @@ bool ColorCodecBench::isSuitableFor(Backend backend) {
 }
 
 void ColorCodecBench::decodeAndXform() {
-    std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(fEncoded));
-    SkASSERT(codec);
-
 #ifdef SK_DEBUG
     SkCodec::Result result =
 #endif
-    codec->getPixels(fDstInfo, fDst.get(), fDstInfo.minRowBytes());
+    SkCodec::MakeFromData(fEncoded)->getPixels(fDstInfo, fDst.get(), fDstInfo.minRowBytes());
     SkASSERT(SkCodec::kSuccess == result);
 }
 
@@ -61,7 +58,7 @@ void ColorCodecBench::xformOnly() {
 }
 
 void ColorCodecBench::onDelayedSetup() {
-    std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(fEncoded));
+    std::unique_ptr<SkCodec> codec = SkCodec::MakeFromData(fEncoded);
     fSrcInfo = codec->getInfo().makeColorType(kRGBA_8888_SkColorType);
     fDstInfo = fSrcInfo;
 
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 95e12118f3..196cb220d0 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -815,7 +815,7 @@ public:
                 continue;
             }
             sk_sp<SkData> encoded(SkData::MakeFromFileName(path.c_str()));
-            std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(encoded));
+            std::unique_ptr<SkCodec> codec(SkCodec::MakeFromData(encoded));
             if (!codec) {
                 // Nothing to time.
                 SkDebugf("Cannot find codec for %s\n", path.c_str());
@@ -894,7 +894,7 @@ public:
                 continue;
             }
             sk_sp<SkData> encoded(SkData::MakeFromFileName(path.c_str()));
-            std::unique_ptr<SkAndroidCodec> codec(SkAndroidCodec::NewFromData(encoded));
+            std::unique_ptr<SkAndroidCodec> codec(SkAndroidCodec::MakeFromData(encoded));
             if (!codec) {
                 // Nothing to time.
                 SkDebugf("Cannot find codec for %s\n", path.c_str());