aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/EncodeTest.cpp
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@skia.org>2018-02-07 15:51:00 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-08 13:34:49 +0000
commit4f5a79c676757c0f218156077fb0575d46a6583c (patch)
tree476f8be1a88454c728d6928c4821d71cb82e2de4 /tests/EncodeTest.cpp
parent4150eea6c49ecec882a8d3e1c61d6a25fcd1e905 (diff)
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>
Diffstat (limited to 'tests/EncodeTest.cpp')
-rw-r--r--tests/EncodeTest.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/EncodeTest.cpp b/tests/EncodeTest.cpp
index 8d5db7ddcd..3c11663c98 100644
--- a/tests/EncodeTest.cpp
+++ b/tests/EncodeTest.cpp
@@ -165,9 +165,9 @@ DEF_TEST(Encode_JpegDownsample, r) {
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 @@ DEF_TEST(Encode_PngOptions, r) {
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 @@ DEF_TEST(Encode_WebpOptions, r) {
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));