diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-18 18:33:15 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-18 18:33:15 +0000 |
| commit | 1ad518bf38184ae820f31f9b79dfb4e4daf5841a (patch) | |
| tree | 32b276fb330b81c18a69c864fd22dfbf79388591 /gm | |
| parent | 1cd71fb013643b983b372fee24eab3708aae70e9 (diff) | |
Reason for revert: Test failures
R=scroggo@google.com, djsollen@google.com, reed@google.com, halcanary@google.com
TBR=djsollen@google.com, halcanary@google.com, reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/103753007
git-svn-id: http://skia.googlecode.com/svn/trunk@12747 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/factory.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gm/factory.cpp b/gm/factory.cpp index efd817db7d..19eb63be0c 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 @@ protected: // 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 @@ private: static GM* MyFactory(void*) { return new FactoryGM; } static GMRegistry reg(MyFactory); -} // namespace skiagm +} |