Revert of Remove uses of SkImageDecoder from gms

gm/filterindiabox.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "Resources.h"
 #include "SkBitmapProcState.h"
 #include "SkBitmapScaler.h"
 #include "SkGradientShader.h"
+#include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
 
 static SkSize computeSize(const SkBitmap& bm, const SkMatrix& mat) {
     SkRect bounds = SkRect::MakeWH(SkIntToScalar(bm.width()),
                                    SkIntToScalar(bm.height()));
     mat.mapRect(&bounds);
     return SkSize::Make(bounds.width(), bounds.height());
 }
@@ skipping 67 matching lines @@
 
   protected:
       SkString fFilename;
       int fSize;
 
       SkScalar getScale() {
           return 192.f/fSize;
       }
 
       void makeBitmap() {
-        if (!GetResourceAsBitmap(fFilename.c_str(), &fBM)) {
-            fBM.allocN32Pixels(1, 1);
-            fBM.eraseARGB(255, 255, 0 , 0); // red == bad
-        }
-        fSize = fBM.height();
+          SkImageDecoder* codec = nullptr;
+          SkString resourcePath = GetResourcePath(fFilename.c_str());
+          SkFILEStream stream(resourcePath.c_str());
+          if (stream.isValid()) {
+              codec = SkImageDecoder::Factory(&stream);
+          }
+          if (codec) {
+              stream.rewind();
+              codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
+              delete codec;
+          } else {
+              fBM.allocN32Pixels(1, 1);
+              *(fBM.getAddr32(0,0)) = 0xFF0000FF; // red == bad
+          }
+          fSize = fBM.height();
       }
   private:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 
 DEF_GM( return new FilterIndiaBoxGM("box.gif"); )