commit 5965c8ae4ee960275da4bc40189bdba85aab8b5e
author reed <reed@google.com> Wed Jan 07 18:04:45 2015 -0800
committer Commit bot <commit-bot@chromium.org> Wed Jan 07 18:04:45 2015 -0800
tree dc7f14af5cbce088311191a981b6ae67c2286be6
parent 23d432080cb8506bf8e371b1637ce8f2de9c0c05

add ImageGenerator::NewFromData to porting layer

BUG=skia:3275

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

gm/astcbitmap.cpp

diff --git a/gm/astcbitmap.cpp b/gm/astcbitmap.cpp
index 3c9079c..b415a82 100644
--- a/gm/astcbitmap.cpp
+++ b/gm/astcbitmap.cpp
@@ -10,7 +10,7 @@
 #include "Resources.h"
 #include "SkCanvas.h"
 #include "SkData.h"
-#include "SkDecodingImageGenerator.h"
+#include "SkImageGenerator.h"
 #include "SkImageDecoder.h"
 #include "SkOSFile.h"
 #include "SkTextureCompressor.h"
@@ -76,9 +76,7 @@
                 }
 
                 SkBitmap bm;
-                if (!SkInstallDiscardablePixelRef(
-                        SkDecodingImageGenerator::Create(
-                            fileData, SkDecodingImageGenerator::Options()), &bm)) {
+                if (!SkInstallDiscardablePixelRef(fileData, &bm)) {
                     SkDebugf("Could not install discardable pixel ref.\n");
                     return;
                 }