| Index: tests/CachedDecodingPixelRefTest.cpp
|
| diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
|
| index f97e89361fab1b19d734fcdda64c9b959ba16295..ada0175e329304e1aeaf2613228c0c69c876bbd6 100644
|
| --- a/tests/CachedDecodingPixelRefTest.cpp
|
| +++ b/tests/CachedDecodingPixelRefTest.cpp
|
| @@ -146,11 +146,12 @@ static void test_three_encodings(skiatest::Reporter* reporter,
|
| ////////////////////////////////////////////////////////////////////////////////
|
| static bool install_skCachingPixelRef(SkData* encoded, SkBitmap* dst) {
|
| return SkCachingPixelRef::Install(
|
| - SkNEW_ARGS(SkDecodingImageGenerator, (encoded)), dst);
|
| + SkNewDecodingImageGenerator(encoded, SkDecoderOptions()), dst);
|
| }
|
| static bool install_skDiscardablePixelRef(SkData* encoded, SkBitmap* dst) {
|
| // Use system-default discardable memory.
|
| - return SkDecodingImageGenerator::Install(encoded, dst, NULL);
|
| + return SkInstallDiscardablePixelRef(
|
| + SkNewDecodingImageGenerator(encoded, SkDecoderOptions()), dst, NULL);
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| @@ -213,10 +214,12 @@ public:
|
| }
|
| return true;
|
| }
|
| +
|
| private:
|
| const TestType fType;
|
| skiatest::Reporter* const fReporter;
|
| };
|
| +
|
| void CheckTestImageGeneratorBitmap(skiatest::Reporter* reporter,
|
| const SkBitmap& bm) {
|
| REPORTER_ASSERT(reporter, TestImageGenerator::Width() == bm.width());
|
| @@ -268,6 +271,7 @@ void CheckPixelRef(TestImageGenerator::TestType type,
|
| }
|
| }
|
| } // namespace
|
| +
|
| /**
|
| * This tests the basic functionality of SkDiscardablePixelRef with a
|
| * basic SkImageGenerator implementation and several
|
|
|