Prototype of RAW decoding in Skia.

src/codec/SkAndroidCodec.cpp

Index: src/codec/SkAndroidCodec.cpp
diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp
index d309d58501a80004c573e2dcbc39d440967a4f85..34830969a17d131533addbfb1e68aab0c04486b4 100644
--- a/src/codec/SkAndroidCodec.cpp
+++ b/src/codec/SkAndroidCodec.cpp
@@ -8,6 +8,9 @@
 #include "SkAndroidCodec.h"
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
+#ifdef SK_CODEC_DECODES_RAW
+#include "SkRawAdapterCodec.h"
+#endif
 #include "SkSampledCodec.h"
 #include "SkWebpAdapterCodec.h"
 
@@ -17,9 +20,7 @@ static bool is_valid_sample_size(int sampleSize) {
 }
 
 SkAndroidCodec::SkAndroidCodec(SkCodec* codec)
-    : fInfo(codec->getInfo())
-    , fCodec(codec)
-{}
+    : fInfo(codec->getInfo()), fCodec(codec) {}

[scroggo, 2016/01/14 15:26:38]

This change is unnecessary.

[yujieqin, 2016/01/15 14:49:30]

Done.

 
 SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader* chunkReader) {
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream, chunkReader));
@@ -37,6 +38,10 @@ SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader
         case kGIF_SkEncodedFormat:
         case kICO_SkEncodedFormat:
             return new SkSampledCodec(codec.detach());
+#ifdef SK_CODEC_DECODES_RAW
+        case kRAW_SkEncodedFormat:
+            return new SkRawAdapterCodec((SkRawCodec*)codec.detach());
+#endif
         default:
             return nullptr;
     }
@@ -182,3 +187,4 @@ SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void*
         size_t rowBytes) {
     return this->getAndroidPixels(info, pixels, rowBytes, nullptr);
 }
+