Remove uses of SkImageDecoder from gms

gm/filterbitmap.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 "SkData.h"
+#include "SkImage.h"
 #include "SkGradientShader.h"
-#include "SkImageDecoder.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
 
 static void setTypeface(SkPaint* paint, const char name[], SkTypeface::Style style) {
     sk_tool_utils::set_portable_typeface(paint, name, style);
 }
 
 static SkSize computeSize(const SkBitmap& bm, const SkMatrix& mat) {
     SkRect bounds = SkRect::MakeWH(SkIntToScalar(bm.width()),
                                    SkIntToScalar(bm.height()));
@@ skipping 166 matching lines @@
 
 protected:
       SkString fFilename;
       int fSize;
 
       SkScalar getScale() override {
           return 192.f/fSize;
       }
 
       void makeBitmap() override {
-          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();
-          if (fConvertToG8) {
-              SkBitmap tmp;
-              fBM.copyTo(&tmp, kGray_8_SkColorType);
-              fBM = tmp;
-          }
+        SkAutoTUnref<SkData> data(SkData::NewFromFileName(
+                GetResourcePath(fFilename.c_str()).c_str()));
+        SkAutoTDelete<SkImage> image(SkImage::NewFromEncoded(data));
+        if (!image || !image->asLegacyBitmap(&fBM, SkImage::kRW_LegacyBitmapMode)) {

[scroggo, 2016/03/17 13:05:48]

GetResourceAsBitmap? Same for a few more files?

[msarett, 2016/03/17 13:53:38]

Done.

+            fBM.allocN32Pixels(1, 1);
+            fBM.eraseARGB(255, 255, 0 , 0); // red == bad
+        }
+        fSize = fBM.height();
+
+        if (fConvertToG8) {
+            SkBitmap tmp;
+            fBM.copyTo(&tmp, kGray_8_SkColorType);
+            fBM = tmp;
+        }
       }
 private:
     const bool fConvertToG8;
     typedef FilterBitmapGM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new FilterBitmapTextGM(3); )
 DEF_GM( return new FilterBitmapTextGM(7); )
 DEF_GM( return new FilterBitmapTextGM(10); )
 DEF_GM( return new FilterBitmapCheckerboardGM(4,4); )
 DEF_GM( return new FilterBitmapCheckerboardGM(32,32); )
 DEF_GM( return new FilterBitmapCheckerboardGM(32,32, true); )
 DEF_GM( return new FilterBitmapCheckerboardGM(32,8); )
 DEF_GM( return new FilterBitmapCheckerboardGM(32,2); )
 DEF_GM( return new FilterBitmapCheckerboardGM(192,192); )
 DEF_GM( return new FilterBitmapImageGM("mandrill_16.png"); )
 DEF_GM( return new FilterBitmapImageGM("mandrill_32.png"); )
 DEF_GM( return new FilterBitmapImageGM("mandrill_64.png"); )
 DEF_GM( return new FilterBitmapImageGM("mandrill_64.png", true); )
 DEF_GM( return new FilterBitmapImageGM("mandrill_128.png"); )
 DEF_GM( return new FilterBitmapImageGM("mandrill_256.png"); )
 DEF_GM( return new FilterBitmapImageGM("mandrill_512.png"); )
 DEF_GM( return new FilterBitmapImageGM("color_wheel.png"); )