Creating a new wrapper for gif decoder

src/codec/SkCodec.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCodec.h"
 #include "SkData.h"
 #include "SkCodec_libbmp.h"
+#include "SkCodec_libgif.h"
 #include "SkCodec_libico.h"
 #include "SkCodec_libpng.h"
 #include "SkStream.h"
 
 struct DecoderProc {
     bool (*IsFormat)(SkStream*);
     SkCodec* (*NewFromStream)(SkStream*);
 };
 
 static const DecoderProc gDecoderProcs[] = {
     { SkPngCodec::IsPng, SkPngCodec::NewFromStream },
-    { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream },
-    { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream }
+    { SkGifCodec::IsGif, SkGifCodec::NewFromStream },
+    { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream },
+    { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream }
 };
 
 SkCodec* SkCodec::NewFromStream(SkStream* stream) {
     if (!stream) {
         return NULL;
     }
+    
+    SkCodec* codec;
     for (uint32_t i = 0; i < SK_ARRAY_COUNT(gDecoderProcs); i++) {
         DecoderProc proc = gDecoderProcs[i];
         const bool correctFormat = proc.IsFormat(stream);
         if (!stream->rewind()) {
             return NULL;
         }
         if (correctFormat) {
-            return proc.NewFromStream(stream);
+            codec = proc.NewFromStream(stream);
+            break;
         }
     }
-    return NULL;
+
+    // TODO: Is this the correct maxSize?  This is 512 MB for kN32.

[scroggo, 2015/03/26 20:03:53]

Maybe explain why it was chosen?

[msarett, 2015/03/26 22:26:36]

Done.

+    const int32_t maxSize = 1 << 27;
+    if (codec->getInfo().width() * codec->getInfo().height() > maxSize) {

[scroggo, 2015/03/26 20:03:53]

We need to check codec for NULL.

[msarett, 2015/03/26 22:26:36]

Done.

+        SkDebugf("Error: Image size too large, cannot decode.\n");

[scroggo, 2015/03/26 20:03:53]

Use SkCodecPrintf.

[msarett, 2015/03/26 22:26:36]

Done.

+        return NULL;
+    } else {
+        return codec;
+    }
 }
 
 SkCodec* SkCodec::NewFromData(SkData* data) {
     if (!data) {
         return NULL;
     }
     return NewFromStream(SkNEW_ARGS(SkMemoryStream, (data)));
 }
 
 SkCodec::SkCodec(const SkImageInfo& info, SkStream* stream)
@@ skipping 14 matching lines @@
 }
 
 SkScanlineDecoder* SkCodec::getScanlineDecoder(const SkImageInfo& dstInfo) {
     fScanlineDecoder.reset(NULL);
     if (!rewindIfNeeded()) {
         return NULL;
     }
     fScanlineDecoder.reset(this->onGetScanlineDecoder(dstInfo));
     return fScanlineDecoder.get();
 }