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

samplecode/SampleEncode.cpp

diff --git a/samplecode/SampleEncode.cpp b/samplecode/SampleEncode.cpp
index e65b2d3..185208b 100644
--- a/samplecode/SampleEncode.cpp
+++ b/samplecode/SampleEncode.cpp
@@ -9,7 +9,7 @@
 #include "SkView.h"
 #include "SkCanvas.h"
 #include "SkData.h"
-#include "SkDecodingImageGenerator.h"
+#include "SkImageGenerator.h"
 #include "SkGradientShader.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
@@ -193,10 +193,7 @@
                     encoded = fEncodedPNGs[i].get();
                 }
                 if (encoded) {
-                    if (!SkInstallDiscardablePixelRef(
-                            SkDecodingImageGenerator::Create(encoded,
-                                SkDecodingImageGenerator::Options()),
-                            &bm)) {
+                    if (!SkInstallDiscardablePixelRef(encoded, &bm)) {
                     SkDebugf("[%s:%d] failed to decode %s%s\n",
                              __FILE__, __LINE__,gConfigLabels[i], gExt[j]);
                     }

samplecode/SamplePicture.cpp

diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp
index 46c57d7..c78571a 100644
--- a/samplecode/SamplePicture.cpp
+++ b/samplecode/SamplePicture.cpp
@@ -13,7 +13,7 @@
 #include "SkColorFilter.h"
 #include "SkColorPriv.h"
 #include "SkData.h"
-#include "SkDecodingImageGenerator.h"
+#include "SkImageGenerator.h"
 #include "SkDumpCanvas.h"
 #include "SkGradientShader.h"
 #include "SkGraphics.h"
@@ -40,8 +40,7 @@
     SkString pngFilename = GetResourcePath("mandrill_512.png");
     SkAutoDataUnref data(SkData::NewFromFileName(pngFilename.c_str()));
     if (data.get() != NULL) {
-        SkInstallDiscardablePixelRef(SkDecodingImageGenerator::Create(
-            data, SkDecodingImageGenerator::Options()), &bm);
+        SkInstallDiscardablePixelRef(data, &bm);
     }
     return bm;
 }