diff options
| author |  reed <reed@google.com> | 2015-09-25 06:56:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-25 06:56:57 -0700 |
| commit | d114645d931d4e95a938597a45a270f211273c17 (patch) | |
| tree | 195585704f873e84248a8c44e80c366025066ba2 /tests | |
| parent | 57b767127f88b4794f7e42e659b585b3b82203c5 (diff) | |
SkInstallDiscardablePixelRef is deprecated, enforce that
No functionality change, just a renaming.
BUG=skia:
TBR=
Review URL: https://codereview.chromium.org/1372593002
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CachedDecodingPixelRefTest.cpp | 4 | ||||
| -rw-r--r-- | tests/KtxTest.cpp | 2 | ||||
| -rw-r--r-- | tests/PDFJpegEmbedTest.cpp | 2 | ||||
| -rw-r--r-- | tests/PictureTest.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp index 136b2f584a..2813b42bf8 100644 --- a/tests/CachedDecodingPixelRefTest.cpp +++ b/tests/CachedDecodingPixelRefTest.cpp @@ -142,7 +142,7 @@ static void test_three_encodings(skiatest::Reporter* reporter, //////////////////////////////////////////////////////////////////////////////// static bool install_skDiscardablePixelRef(SkData* encoded, SkBitmap* dst) { // Use system-default discardable memory. - return SkInstallDiscardablePixelRef(encoded, dst); + return SkDEPRECATED_InstallDiscardablePixelRef(encoded, dst); } //////////////////////////////////////////////////////////////////////////////// @@ -228,7 +228,7 @@ static void check_pixelref(TestImageGenerator::TestType type, SkAutoTDelete<SkImageGenerator> gen(new TestImageGenerator(type, reporter)); REPORTER_ASSERT(reporter, gen.get() != nullptr); SkBitmap lazy; - bool success = SkInstallDiscardablePixelRef(gen.detach(), nullptr, &lazy, factory); + bool success = SkDEPRECATED_InstallDiscardablePixelRef(gen.detach(), nullptr, &lazy, factory); REPORTER_ASSERT(reporter, success); if (TestImageGenerator::kSucceedGetPixels_TestType == type) { diff --git a/tests/KtxTest.cpp b/tests/KtxTest.cpp index 4315e6dbd6..e0d9a27b40 100644 --- a/tests/KtxTest.cpp +++ b/tests/KtxTest.cpp @@ -150,7 +150,7 @@ DEF_TEST(KtxReexportPKM, reporter) { } bool installDiscardablePixelRefSuccess = - SkInstallDiscardablePixelRef(fileData, &etcBitmap); + SkDEPRECATED_InstallDiscardablePixelRef(fileData, &etcBitmap); REPORTER_ASSERT(reporter, installDiscardablePixelRefSuccess); // Write the bitmap out to a KTX file. diff --git a/tests/PDFJpegEmbedTest.cpp b/tests/PDFJpegEmbedTest.cpp index 530ed2a1d0..812fd3b2c3 100644 --- a/tests/PDFJpegEmbedTest.cpp +++ b/tests/PDFJpegEmbedTest.cpp @@ -18,7 +18,7 @@ static SkBitmap bitmap_from_data(SkData* data) { SkASSERT(data); SkBitmap bm; - SkInstallDiscardablePixelRef(data, &bm); + SkDEPRECATED_InstallDiscardablePixelRef(data, &bm); return bm; } diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp index 45edc715ef..dee24e367e 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -887,7 +887,7 @@ static void test_bitmap_with_encoded_data(skiatest::Reporter* reporter) { SkAutoDataUnref data(wStream.copyToData()); SkBitmap bm; - bool installSuccess = SkInstallDiscardablePixelRef(data, &bm); + bool installSuccess = SkDEPRECATED_InstallDiscardablePixelRef(data, &bm); REPORTER_ASSERT(reporter, installSuccess); // Write both bitmaps to pictures, and ensure that the resulting data streams are the same. |