Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(747)

Unified Diff: gm/factory.cpp

Issue 103753007: Revert of Change SkDecodingImageGenerator API (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | include/core/SkImageGenerator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/factory.cpp
diff --git a/gm/factory.cpp b/gm/factory.cpp
index efd817db7dd255e88a4ac63b93568c9b8e4e1653..19eb63be0c87206ec54f262ea1e1326f6546da64 100644
--- a/gm/factory.cpp
+++ b/gm/factory.cpp
@@ -12,7 +12,6 @@
#include "SkDiscardableMemoryPool.h"
#include "SkDiscardablePixelRef.h"
#include "SkImageDecoder.h"
-#include "SkImageGenerator.h"
#include "SkOSFile.h"
#include "SkStream.h"
@@ -36,10 +35,8 @@
// bitmap is unlocked.
SkAutoTUnref<SkDiscardableMemoryPool> pool(
SkNEW_ARGS(SkDiscardableMemoryPool, (1)));
- SkAssertResult(SkInstallDiscardablePixelRef(
- SkDecodingImageGenerator::Create(
- data, SkDecodingImageGenerator::Options()),
- &fBitmap, pool));
+ SkAssertResult(SkDecodingImageGenerator::Install(data,
+ &fBitmap, pool));
}
}
@@ -71,4 +68,4 @@
static GM* MyFactory(void*) { return new FactoryGM; }
static GMRegistry reg(MyFactory);
-} // namespace skiagm
+}
« no previous file with comments | « no previous file | include/core/SkImageGenerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698