Make sp variants for SkData

src/images/SkImageDecoder_ktx.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorPriv.h"
 #include "SkImageDecoder.h"
 #include "SkImageGenerator.h"
@@ skipping 32 matching lines @@
 
 protected:
     Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
 
 private:
     typedef SkImageDecoder INHERITED;
 };
 
 SkImageDecoder::Result SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     // TODO: Implement SkStream::copyToData() that's cheap for memory and file streams
-    SkAutoDataUnref data(SkCopyStreamToData(stream));
+    auto data = SkCopyStreamToData(stream);
     if (nullptr == data) {
         return kFailure;
     }
 
-    SkKTXFile ktxFile(data);
+    SkKTXFile ktxFile(data.get());

[scroggo, 2016/03/11 15:28:35]

Should this class take an sk_sp?

[reed1, 2016/03/11 19:23:34]

Yes (in a separate CL)

     if (!ktxFile.valid()) {
         return kFailure;
     }
 
     const unsigned short width = ktxFile.width();
     const unsigned short height = ktxFile.height();
 
     // Set a flag if our source is premultiplied alpha
     const SkString premulKey("KTXPremultipliedAlpha");
     const bool bSrcIsPremul = ktxFile.getValueForKey(premulKey) == SkString("True");
@@ skipping 253 matching lines @@
     return SkImageDecoder::kUnknown_Format;
 }
 
 SkImageEncoder* sk_libktx_efactory(SkImageEncoder::Type t) {
     return (SkImageEncoder::kKTX_Type == t) ? new SkKTXImageEncoder : nullptr;
 }
 
 static SkImageDecoder_DecodeReg gReg(sk_libktx_dfactory);
 static SkImageDecoder_FormatReg gFormatReg(get_format_ktx);
 static SkImageEncoder_EncodeReg gEReg(sk_libktx_efactory);