| Index: gm/factory.cpp
|
| diff --git a/gm/factory.cpp b/gm/factory.cpp
|
| index a9bf519c0003bca0c992f92ea778531b9d9fb166..9cc5bb8df4261d4bfa9cfed05402e0e408e3cf4c 100644
|
| --- a/gm/factory.cpp
|
| +++ b/gm/factory.cpp
|
| @@ -10,7 +10,6 @@
|
| #include "Resources.h"
|
| #include "SkCanvas.h"
|
| #include "SkData.h"
|
| -#include "SkDecodingImageGenerator.h"
|
| #include "SkDiscardableMemoryPool.h"
|
| #include "SkDiscardablePixelRef.h"
|
| #include "SkImageDecoder.h"
|
| @@ -37,10 +36,8 @@ protected:
|
| // bitmap is unlocked.
|
| SkAutoTUnref<SkDiscardableMemoryPool> pool(
|
| SkDiscardableMemoryPool::Create(1));
|
| - SkAssertResult(SkInstallDiscardablePixelRef(
|
| - SkDecodingImageGenerator::Create(
|
| - data, SkDecodingImageGenerator::Options()),
|
| - &fBitmap, pool));
|
| + SkAssertResult(SkInstallDiscardablePixelRef(SkImageGenerator::NewFromData(data),
|
| + &fBitmap, pool));
|
| }
|
| }
|
|
|
|
|