aboutsummaryrefslogtreecommitdiff
path: root/tests/CachedDecodingPixelRefTest.cpp
diff options
context:
space:
mode:
authorcommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-27 14:14:22 +0000
committercommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-27 14:14:22 +0000
commit2d970b5128f7270cd01a93e4ce68d0c3ea67ac71 (patch)
tree2592f202dfb36d05e42004ecdb237ddd4471ef9e /tests/CachedDecodingPixelRefTest.cpp
parent851155c28e18e3f5b702ef15ee7bfb12f3cbacda (diff)
hide discardable factory from public imagegenerator api
BUG=skia: R=halcanary@google.com, scroggo@google.com, djsollen@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/295243006 git-svn-id: http://skia.googlecode.com/svn/trunk@14889 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/CachedDecodingPixelRefTest.cpp')
-rw-r--r--tests/CachedDecodingPixelRefTest.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
index 705f0666a4..10e33ba841 100644
--- a/tests/CachedDecodingPixelRefTest.cpp
+++ b/tests/CachedDecodingPixelRefTest.cpp
@@ -12,6 +12,7 @@
#include "SkDecodingImageGenerator.h"
#include "SkDiscardableMemoryPool.h"
#include "SkImageDecoder.h"
+#include "SkImageGeneratorPriv.h"
#include "SkScaledImageCache.h"
#include "SkStream.h"
#include "SkUtils.h"
@@ -152,7 +153,7 @@ static bool install_skDiscardablePixelRef(SkData* encoded, SkBitmap* dst) {
// Use system-default discardable memory.
return SkInstallDiscardablePixelRef(
SkDecodingImageGenerator::Create(
- encoded, SkDecodingImageGenerator::Options()), dst, NULL);
+ encoded, SkDecodingImageGenerator::Options()), dst);
}
////////////////////////////////////////////////////////////////////////////////
@@ -276,7 +277,7 @@ static void test_newlockdelete(skiatest::Reporter* reporter) {
SkBitmap bm;
SkImageGenerator* ig = new TestImageGenerator(
TestImageGenerator::kSucceedGetPixels_TestType, reporter);
- SkInstallDiscardablePixelRef(ig, &bm, NULL);
+ SkInstallDiscardablePixelRef(ig, &bm);
bm.pixelRef()->lockPixels();
}