diff options
| author |  Mike Reed <reed@google.com> | 2017-04-17 11:02:51 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-17 15:33:36 +0000 |
| commit | 4edb5d219eb99aa1e8fbe5e37260d3b34314e54b (patch) | |
| tree | 5e9fedc4e0e59db2467a19fe7d4f36030d0d6694 /tests/CodecTest.cpp | |
| parent | 12e946b4bfdf598bffb276776ea6e25439e25265 (diff) | |
hide lockpixels api behind flag
guarded by SK_SUPPORT_OBSOLETE_LOCKPIXELS
needs https://codereview.chromium.org/2820873002/# to land first
Bug: skia:6481
Change-Id: I1c39902cbf6fe99f622adfa8192733b95f7fea09
Change-Id: I1c39902cbf6fe99f622adfa8192733b95f7fea09
Reviewed-on: https://skia-review.googlesource.com/13580
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/CodecTest.cpp')
| -rw-r--r-- | tests/CodecTest.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index 2c601fadb0..ceafa15cb1 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -38,7 +38,6 @@ #endif static void md5(const SkBitmap& bm, SkMD5::Digest* digest) { - SkAutoLockPixels autoLockPixels(bm); SkASSERT(bm.getPixels()); SkMD5 md5; size_t rowLen = bm.info().bytesPerPixel() * bm.width(); @@ -72,7 +71,6 @@ static void test_info(skiatest::Reporter* r, Codec* codec, const SkImageInfo& in SkCodec::Result expectedResult, const SkMD5::Digest* goodDigest) { SkBitmap bm; bm.allocPixels(info); - SkAutoLockPixels autoLockPixels(bm); SkCodec::Result result = codec->getPixels(info, bm.getPixels(), bm.rowBytes()); REPORTER_ASSERT(r, result == expectedResult); @@ -98,7 +96,6 @@ static void test_incremental_decode(skiatest::Reporter* r, SkCodec* codec, const const SkMD5::Digest& goodDigest) { SkBitmap bm; bm.allocPixels(info); - SkAutoLockPixels autoLockPixels(bm); REPORTER_ASSERT(r, SkCodec::kSuccess == codec->startIncrementalDecode(info, bm.getPixels(), bm.rowBytes())); @@ -157,7 +154,6 @@ static void test_codec(skiatest::Reporter* r, Codec* codec, SkBitmap& bm, const REPORTER_ASSERT(r, info.dimensions() == size); bm.allocPixels(info); - SkAutoLockPixels autoLockPixels(bm); SkCodec::Result result = codec->getPixels(info, bm.getPixels(), bm.rowBytes()); REPORTER_ASSERT(r, result == expectedResult); @@ -174,7 +170,6 @@ static void test_codec(skiatest::Reporter* r, Codec* codec, SkBitmap& bm, const // Decoding to 565 should succeed. SkBitmap bm565; bm565.allocPixels(info565); - SkAutoLockPixels alp(bm565); // This will allow comparison even if the image is incomplete. bm565.eraseColor(SK_ColorBLACK); @@ -199,7 +194,6 @@ static void test_codec(skiatest::Reporter* r, Codec* codec, SkBitmap& bm, const SkImageInfo grayInfo = codec->getInfo(); SkBitmap grayBm; grayBm.allocPixels(grayInfo); - SkAutoLockPixels alp(grayBm); grayBm.eraseColor(SK_ColorBLACK); @@ -442,7 +436,6 @@ static void check(skiatest::Reporter* r, SkCodecImageGenerator::MakeFromEncodedCodec(fullData)); SkBitmap bm; bm.allocPixels(info); - SkAutoLockPixels autoLockPixels(bm); REPORTER_ASSERT(r, gen->getPixels(info, bm.getPixels(), bm.rowBytes())); compare_to_good_digest(r, codecDigest, bm); |