diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-27 14:14:22 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-27 14:14:22 +0000 |
| commit | 2d970b5128f7270cd01a93e4ce68d0c3ea67ac71 (patch) | |
| tree | 2592f202dfb36d05e42004ecdb237ddd4471ef9e /tests | |
| parent | 851155c28e18e3f5b702ef15ee7bfb12f3cbacda (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')
| -rw-r--r-- | tests/CachedDecodingPixelRefTest.cpp | 5 | ||||
| -rw-r--r-- | tests/DrawBitmapRectTest.cpp | 2 | ||||
| -rw-r--r-- | tests/ImageDecodingTest.cpp | 9 | ||||
| -rw-r--r-- | tests/PictureTest.cpp | 2 |
4 files changed, 9 insertions, 9 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(); } diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp index e6cc781f18..f294ae7e6e 100644 --- a/tests/DrawBitmapRectTest.cpp +++ b/tests/DrawBitmapRectTest.cpp @@ -9,7 +9,7 @@ #include "SkCanvas.h" #include "SkData.h" #include "SkDiscardableMemoryPool.h" -#include "SkImageGenerator.h" +#include "SkImageGeneratorPriv.h" #include "SkMatrixUtils.h" #include "SkPaint.h" #include "SkRandom.h" diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp index 7f9ff3042e..21c774727d 100644 --- a/tests/ImageDecodingTest.cpp +++ b/tests/ImageDecodingTest.cpp @@ -16,7 +16,7 @@ #include "SkGradientShader.h" #include "SkImageDecoder.h" #include "SkImageEncoder.h" -#include "SkImageGenerator.h" +#include "SkImageGeneratorPriv.h" #include "SkImagePriv.h" #include "SkOSFile.h" #include "SkPoint.h" @@ -455,7 +455,7 @@ DEF_TEST(WebP, reporter) { bool success = SkInstallDiscardablePixelRef( SkDecodingImageGenerator::Create(encoded, - SkDecodingImageGenerator::Options()), &bm, NULL); + SkDecodingImageGenerator::Options()), &bm); REPORTER_ASSERT(reporter, success); if (!success) { @@ -584,14 +584,13 @@ static void test_options(skiatest::Reporter* reporter, return; } success = SkInstallDiscardablePixelRef( - SkDecodingImageGenerator::Create(encodedData, opts), &bm, NULL); + SkDecodingImageGenerator::Create(encodedData, opts), &bm); } else { if (NULL == encodedStream) { return; } success = SkInstallDiscardablePixelRef( - SkDecodingImageGenerator::Create(encodedStream->duplicate(), opts), - &bm, NULL); + SkDecodingImageGenerator::Create(encodedStream->duplicate(), opts), &bm); } if (!success) { if (opts.fUseRequestedColorType diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp index 8467d6a082..ac44a5ce6d 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -1113,7 +1113,7 @@ static void test_bitmap_with_encoded_data(skiatest::Reporter* reporter) { SkBitmap bm; bool installSuccess = SkInstallDiscardablePixelRef( - SkDecodingImageGenerator::Create(data, SkDecodingImageGenerator::Options()), &bm, NULL); + SkDecodingImageGenerator::Create(data, SkDecodingImageGenerator::Options()), &bm); REPORTER_ASSERT(reporter, installSuccess); // Write both bitmaps to pictures, and ensure that the resulting data streams are the same. |