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/etc1bitmap.cpp

diff --git a/gm/etc1bitmap.cpp b/gm/etc1bitmap.cpp
index fcf521a..76593f4 100644
--- a/gm/etc1bitmap.cpp
+++ b/gm/etc1bitmap.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"
 
@@ -103,9 +103,7 @@
             return;
         }
 
-        if (!SkInstallDiscardablePixelRef(
-                SkDecodingImageGenerator::Create(
-                    fileData, SkDecodingImageGenerator::Options()), &bm)) {
+        if (!SkInstallDiscardablePixelRef(fileData, &bm)) {
             SkDebugf("Could not install discardable pixel ref.\n");
             return;
         }
@@ -204,9 +202,7 @@
         size_t dataSz = etc1_get_encoded_data_size(width, height) + ETC_PKM_HEADER_SIZE;
         SkAutoDataUnref nonPOTData(SkData::NewWithCopy(am.get(), dataSz));
 
-        if (!SkInstallDiscardablePixelRef(
-                SkDecodingImageGenerator::Create(
-                    nonPOTData, SkDecodingImageGenerator::Options()), &bm)) {
+        if (!SkInstallDiscardablePixelRef(nonPOTData, &bm)) {
             SkDebugf("Could not install discardable pixel ref.\n");
             return;
         }