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/ImageTest.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/ImageTest.cpp')
| -rw-r--r-- | tests/ImageTest.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 22004a07c6..77017f3885 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -691,7 +691,6 @@ static void check_legacy_bitmap(skiatest::Reporter* reporter, const SkImage* ima REPORTER_ASSERT(reporter, bitmap.isImmutable()); } - SkAutoLockPixels alp(bitmap); REPORTER_ASSERT(reporter, bitmap.getPixels()); const SkImageInfo info = SkImageInfo::MakeN32(1, 1, bitmap.alphaType()); @@ -1065,7 +1064,6 @@ DEF_TEST(Image_makeColorSpace, r) { SkBitmap p3Bitmap; bool success = p3Image->asLegacyBitmap(&p3Bitmap, SkImage::kRO_LegacyBitmapMode); REPORTER_ASSERT(r, success); - p3Bitmap.lockPixels(); REPORTER_ASSERT(r, almost_equal(0x28, SkGetPackedR32(*p3Bitmap.getAddr32(0, 0)))); REPORTER_ASSERT(r, almost_equal(0x40, SkGetPackedG32(*p3Bitmap.getAddr32(0, 0)))); REPORTER_ASSERT(r, almost_equal(0x5E, SkGetPackedB32(*p3Bitmap.getAddr32(0, 0)))); @@ -1075,7 +1073,6 @@ DEF_TEST(Image_makeColorSpace, r) { SkBitmap adobeBitmap; success = adobeImage->asLegacyBitmap(&adobeBitmap, SkImage::kRO_LegacyBitmapMode); REPORTER_ASSERT(r, success); - adobeBitmap.lockPixels(); REPORTER_ASSERT(r, almost_equal(0x21, SkGetPackedR32(*adobeBitmap.getAddr32(0, 0)))); REPORTER_ASSERT(r, almost_equal(0x31, SkGetPackedG32(*adobeBitmap.getAddr32(0, 0)))); REPORTER_ASSERT(r, almost_equal(0x4C, SkGetPackedB32(*adobeBitmap.getAddr32(0, 0)))); @@ -1084,7 +1081,6 @@ DEF_TEST(Image_makeColorSpace, r) { p3Image = srgbImage->makeColorSpace(p3, SkTransferFunctionBehavior::kIgnore); success = p3Image->asLegacyBitmap(&p3Bitmap, SkImage::kRO_LegacyBitmapMode); REPORTER_ASSERT(r, success); - p3Bitmap.lockPixels(); REPORTER_ASSERT(r, almost_equal(0x8B, SkGetPackedR32(*p3Bitmap.getAddr32(0, 0)))); REPORTER_ASSERT(r, almost_equal(0x82, SkGetPackedG32(*p3Bitmap.getAddr32(0, 0)))); REPORTER_ASSERT(r, almost_equal(0x77, SkGetPackedB32(*p3Bitmap.getAddr32(0, 0)))); |