Bis: Use SkImage::NewFromGenerator() instead of SkImage::newEncodedData()

gm/image.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 "SkSurface.h"
 #include "SkCanvas.h"
+#include "SkDecodingImageGenerator.h"
 #include "SkStream.h"
 #include "SkData.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #endif
 
 static SkData* fileToData(const char path[]) {
     SkFILEStream stream(path);
     if (!stream.isValid()) {
         return SkData::NewEmpty();
     }
     size_t size = stream.getLength();
     void* mem = sk_malloc_throw(size);
     stream.read(mem, size);
     return SkData::NewFromMalloc(mem, size);
 }
 
 static void drawJpeg(SkCanvas* canvas, const SkISize& size) {
     // TODO: Make this draw a file that is checked in, so it can
     // be exercised on machines other than mike's. Will require a
     // rebaseline.
     SkAutoDataUnref data(fileToData("/Users/mike/Downloads/skia.google.jpeg"));
-    SkImage* image = SkImage::NewEncodedData(data);
+    SkImage* image = SkImage::NewFromGenerator(
+                SkDecodingImageGenerator::Create(data, SkDecodingImageGenerator::Options()));
     if (image) {
         SkAutoCanvasRestore acr(canvas, true);
         canvas->scale(size.width() * 1.0f / image->width(),
                       size.height() * 1.0f / image->height());
         image->draw(canvas, 0, 0, NULL);
         image->unref();
     }
 }
 
 static void drawContents(SkSurface* surface, SkColor fillC) {
@@ skipping 159 matching lines @@
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static skiagm::GM* MyFactory(void*) { return new ImageGM; }
 static skiagm::GMRegistry reg(MyFactory);