remove kRW_LegacyBitmapMode
experiment to see if there are any unknown dependencies
on kRW_LegacyBitmapMode
R=reed@google.com,fmalita@chromium.org,bungeman@google.com
Bug: skia:5615
Change-Id: I2cc578570ac18cd31c3520e1bd801f4a7a669347
Reviewed-on: https://skia-review.googlesource.com/105283
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
diff --git a/tests/EncodeTest.cpp b/tests/EncodeTest.cpp
index 8d5db7d..3c11663 100644
--- a/tests/EncodeTest.cpp
+++ b/tests/EncodeTest.cpp
@@ -165,9 +165,9 @@
REPORTER_ASSERT(r, data1->size() < data2->size());
SkBitmap bm0, bm1, bm2;
- SkImage::MakeFromEncoded(data0)->asLegacyBitmap(&bm0, SkImage::kRO_LegacyBitmapMode);
- SkImage::MakeFromEncoded(data1)->asLegacyBitmap(&bm1, SkImage::kRO_LegacyBitmapMode);
- SkImage::MakeFromEncoded(data2)->asLegacyBitmap(&bm2, SkImage::kRO_LegacyBitmapMode);
+ SkImage::MakeFromEncoded(data0)->asLegacyBitmap(&bm0);
+ SkImage::MakeFromEncoded(data1)->asLegacyBitmap(&bm1);
+ SkImage::MakeFromEncoded(data2)->asLegacyBitmap(&bm2);
REPORTER_ASSERT(r, almost_equals(bm0, bm1, 60));
REPORTER_ASSERT(r, almost_equals(bm1, bm2, 60));
}
@@ -279,9 +279,9 @@
REPORTER_ASSERT(r, data1->size() < data2->size());
SkBitmap bm0, bm1, bm2;
- SkImage::MakeFromEncoded(data0)->asLegacyBitmap(&bm0, SkImage::kRO_LegacyBitmapMode);
- SkImage::MakeFromEncoded(data1)->asLegacyBitmap(&bm1, SkImage::kRO_LegacyBitmapMode);
- SkImage::MakeFromEncoded(data2)->asLegacyBitmap(&bm2, SkImage::kRO_LegacyBitmapMode);
+ SkImage::MakeFromEncoded(data0)->asLegacyBitmap(&bm0);
+ SkImage::MakeFromEncoded(data1)->asLegacyBitmap(&bm1);
+ SkImage::MakeFromEncoded(data2)->asLegacyBitmap(&bm2);
REPORTER_ASSERT(r, almost_equals(bm0, bm1, 0));
REPORTER_ASSERT(r, almost_equals(bm0, bm2, 0));
}
@@ -330,10 +330,10 @@
REPORTER_ASSERT(r, data2->size() > data3->size());
SkBitmap bm0, bm1, bm2, bm3;
- SkImage::MakeFromEncoded(data0)->asLegacyBitmap(&bm0, SkImage::kRO_LegacyBitmapMode);
- SkImage::MakeFromEncoded(data1)->asLegacyBitmap(&bm1, SkImage::kRO_LegacyBitmapMode);
- SkImage::MakeFromEncoded(data2)->asLegacyBitmap(&bm2, SkImage::kRO_LegacyBitmapMode);
- SkImage::MakeFromEncoded(data3)->asLegacyBitmap(&bm3, SkImage::kRO_LegacyBitmapMode);
+ SkImage::MakeFromEncoded(data0)->asLegacyBitmap(&bm0);
+ SkImage::MakeFromEncoded(data1)->asLegacyBitmap(&bm1);
+ SkImage::MakeFromEncoded(data2)->asLegacyBitmap(&bm2);
+ SkImage::MakeFromEncoded(data3)->asLegacyBitmap(&bm3);
REPORTER_ASSERT(r, almost_equals(bm0, bm1, 0));
REPORTER_ASSERT(r, almost_equals(bm0, bm2, 90));
REPORTER_ASSERT(r, almost_equals(bm2, bm3, 45));
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index b7b92a0..700584e 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -689,14 +689,12 @@
#endif
static void check_legacy_bitmap(skiatest::Reporter* reporter, const SkImage* image,
- const SkBitmap& bitmap, SkImage::LegacyBitmapMode mode) {
+ const SkBitmap& bitmap) {
REPORTER_ASSERT(reporter, image->width() == bitmap.width());
REPORTER_ASSERT(reporter, image->height() == bitmap.height());
REPORTER_ASSERT(reporter, image->alphaType() == bitmap.alphaType());
- if (SkImage::kRO_LegacyBitmapMode == mode) {
- REPORTER_ASSERT(reporter, bitmap.isImmutable());
- }
+ REPORTER_ASSERT(reporter, bitmap.isImmutable());
REPORTER_ASSERT(reporter, bitmap.getPixels());
@@ -706,14 +704,14 @@
REPORTER_ASSERT(reporter, imageColor == *bitmap.getAddr32(0, 0));
}
-static void test_legacy_bitmap(skiatest::Reporter* reporter, const SkImage* image, SkImage::LegacyBitmapMode mode) {
+static void test_legacy_bitmap(skiatest::Reporter* reporter, const SkImage* image) {
if (!image) {
ERRORF(reporter, "Failed to create image.");
return;
}
SkBitmap bitmap;
- REPORTER_ASSERT(reporter, image->asLegacyBitmap(&bitmap, mode));
- check_legacy_bitmap(reporter, image, bitmap, mode);
+ REPORTER_ASSERT(reporter, image->asLegacyBitmap(&bitmap));
+ check_legacy_bitmap(reporter, image, bitmap);
// Test subsetting to exercise the rowBytes logic.
SkBitmap tmp;
@@ -723,41 +721,29 @@
REPORTER_ASSERT(reporter, subsetImage.get());
SkBitmap subsetBitmap;
- REPORTER_ASSERT(reporter, subsetImage->asLegacyBitmap(&subsetBitmap, mode));
- check_legacy_bitmap(reporter, subsetImage.get(), subsetBitmap, mode);
+ REPORTER_ASSERT(reporter, subsetImage->asLegacyBitmap(&subsetBitmap));
+ check_legacy_bitmap(reporter, subsetImage.get(), subsetBitmap);
}
DEF_TEST(ImageLegacyBitmap, reporter) {
- const SkImage::LegacyBitmapMode modes[] = {
- SkImage::kRO_LegacyBitmapMode,
- SkImage::kRW_LegacyBitmapMode,
- };
- for (auto& mode : modes) {
- sk_sp<SkImage> image(create_image());
- test_legacy_bitmap(reporter, image.get(), mode);
+ sk_sp<SkImage> image(create_image());
+ test_legacy_bitmap(reporter, image.get());
- image = create_data_image();
- test_legacy_bitmap(reporter, image.get(), mode);
+ image = create_data_image();
+ test_legacy_bitmap(reporter, image.get());
- RasterDataHolder dataHolder;
- image = create_rasterproc_image(&dataHolder);
- test_legacy_bitmap(reporter, image.get(), mode);
- image.reset();
- REPORTER_ASSERT(reporter, 1 == dataHolder.fReleaseCount);
+ RasterDataHolder dataHolder;
+ image = create_rasterproc_image(&dataHolder);
+ test_legacy_bitmap(reporter, image.get());
+ image.reset();
+ REPORTER_ASSERT(reporter, 1 == dataHolder.fReleaseCount);
- image = create_codec_image();
- test_legacy_bitmap(reporter, image.get(), mode);
- }
+ image = create_codec_image();
+ test_legacy_bitmap(reporter, image.get());
}
#if SK_SUPPORT_GPU
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageLegacyBitmap_Gpu, reporter, ctxInfo) {
- const SkImage::LegacyBitmapMode modes[] = {
- SkImage::kRO_LegacyBitmapMode,
- SkImage::kRW_LegacyBitmapMode,
- };
- for (auto& mode : modes) {
- sk_sp<SkImage> image(create_gpu_image(ctxInfo.grContext()));
- test_legacy_bitmap(reporter, image.get(), mode);
- }
+ sk_sp<SkImage> image(create_gpu_image(ctxInfo.grContext()));
+ test_legacy_bitmap(reporter, image.get());
}
#endif
@@ -1352,7 +1338,7 @@
sk_sp<SkImage> srgbImage = SkImage::MakeFromBitmap(srgbBitmap);
sk_sp<SkImage> p3Image = srgbImage->makeColorSpace(p3, SkTransferFunctionBehavior::kIgnore);
SkBitmap p3Bitmap;
- bool success = p3Image->asLegacyBitmap(&p3Bitmap, SkImage::kRO_LegacyBitmapMode);
+ bool success = p3Image->asLegacyBitmap(&p3Bitmap);
REPORTER_ASSERT(r, success);
REPORTER_ASSERT(r, almost_equal(0x28, SkGetPackedR32(*p3Bitmap.getAddr32(0, 0))));
REPORTER_ASSERT(r, almost_equal(0x40, SkGetPackedG32(*p3Bitmap.getAddr32(0, 0))));
@@ -1361,7 +1347,7 @@
sk_sp<SkImage> adobeImage = srgbImage->makeColorSpace(adobeGamut,
SkTransferFunctionBehavior::kIgnore);
SkBitmap adobeBitmap;
- success = adobeImage->asLegacyBitmap(&adobeBitmap, SkImage::kRO_LegacyBitmapMode);
+ success = adobeImage->asLegacyBitmap(&adobeBitmap);
REPORTER_ASSERT(r, success);
REPORTER_ASSERT(r, almost_equal(0x21, SkGetPackedR32(*adobeBitmap.getAddr32(0, 0))));
REPORTER_ASSERT(r, almost_equal(0x31, SkGetPackedG32(*adobeBitmap.getAddr32(0, 0))));
@@ -1369,7 +1355,7 @@
srgbImage = GetResourceAsImage("images/1x1.png");
p3Image = srgbImage->makeColorSpace(p3, SkTransferFunctionBehavior::kIgnore);
- success = p3Image->asLegacyBitmap(&p3Bitmap, SkImage::kRO_LegacyBitmapMode);
+ success = p3Image->asLegacyBitmap(&p3Bitmap);
REPORTER_ASSERT(r, success);
REPORTER_ASSERT(r, almost_equal(0x8B, SkGetPackedR32(*p3Bitmap.getAddr32(0, 0))));
REPORTER_ASSERT(r, almost_equal(0x82, SkGetPackedG32(*p3Bitmap.getAddr32(0, 0))));
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index de1cd9a..a598c1c 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -1042,7 +1042,7 @@
sk_sp<SkImage> image = surface->makeImageSnapshot();
SkBitmap bitmap;
- image->asLegacyBitmap(&bitmap, SkImage::kRO_LegacyBitmapMode);
+ image->asLegacyBitmap(&bitmap);
for (int y = 0; y < 10; y++) {
for (int x = 0; x < 10; x++) {
REPORTER_ASSERT(r, 1 == SkGetPackedA32(*bitmap.getAddr32(x, y)));