From 5965c8ae4ee960275da4bc40189bdba85aab8b5e Mon Sep 17 00:00:00 2001
From: reed <reed@google.com>
Date: Wed, 7 Jan 2015 18:04:45 -0800
Subject: add ImageGenerator::NewFromData to porting layer

BUG=skia:3275

Review URL: https://codereview.chromium.org/834633006
---
 tools/Resources.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'tools/Resources.cpp')

diff --git a/tools/Resources.cpp b/tools/Resources.cpp
index 50c08922fa..43cc21d209 100644
--- a/tools/Resources.cpp
+++ b/tools/Resources.cpp
@@ -9,7 +9,7 @@
 #include "SkBitmap.h"
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
-#include "SkDecodingImageGenerator.h"
+#include "SkImageGenerator.h"
 #include "SkOSFile.h"
 
 DEFINE_string2(resourcePath, i, "resources", "Directory with test resources: images, fonts, etc.");
@@ -26,7 +26,5 @@ bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) {
     SkString resourcePath = GetResourcePath(resource);
     SkAutoTUnref<SkData> resourceData(
             SkData::NewFromFileName(resourcePath.c_str()));
-    return resourceData && SkInstallDiscardablePixelRef(
-            SkDecodingImageGenerator::Create(
-                    resourceData, SkDecodingImageGenerator::Options()), dst);
+    return resourceData && SkInstallDiscardablePixelRef(resourceData, dst);
 }
-- 
cgit v1.2.3