add runtime option to provide data->imagegenerator factory

BUG=skia:

Review URL: https://codereview.chromium.org/1229933003

2 files changed, 2 insertions, 2 deletions

diff --git a/gm/factory.cpp b/gm/factory.cpp
index 4af37636f9..0a938629b9 100644
--- a/gm/factory.cpp
+++ b/gm/factory.cpp
@@ -36,7 +36,7 @@ protected:
             // bitmap is unlocked.
             SkAutoTUnref<SkDiscardableMemoryPool> pool(
                 SkDiscardableMemoryPool::Create(1));
-            SkAssertResult(SkInstallDiscardablePixelRef(SkImageGenerator::NewFromData(data),
+            SkAssertResult(SkInstallDiscardablePixelRef(SkImageGenerator::NewFromEncoded(data),
                                                         NULL, &fBitmap, pool));
         }
     }
diff --git a/gm/mipmap.cpp b/gm/mipmap.cpp
index 2d4ee0d26e..ad45a17e86 100644
--- a/gm/mipmap.cpp
+++ b/gm/mipmap.cpp
@@ -29,7 +29,7 @@ static SkImage* make_image() {
 }
 
 static void test_mip(SkCanvas* canvas) {
-    SkAutoTUnref<SkImage> img(make_image());//SkImage::NewFromData(data));
+    SkAutoTUnref<SkImage> img(make_image());//SkImage::NewFromEncoded(data));
 
     SkPaint paint;
     const SkRect dst = SkRect::MakeWH(177, 15);