diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-07-05 11:39:27 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-05 17:49:10 +0000 |
| commit | bace7a940a6d83051eaa98b73dfa8867ed16ac2e (patch) | |
| tree | 9b9030db3336e7432d6d0ed6db61ef388492b2ef /dm/DM.cpp | |
| parent | 1d2678f8ca5f48b3461c06f125372320ca905acc (diff) | |
Remove CodecSrc::kIndex8_Always_DstColorType
We have removed support for drawing Index8, so stop testing it in DM.
Bug: skia: 6828
Change-Id: Ib2c4d3ebd371be704151a9f956c0ca2aaf2926a6
Reviewed-on: https://skia-review.googlesource.com/21525
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'dm/DM.cpp')
| -rw-r--r-- | dm/DM.cpp | 26 |
1 files changed, 4 insertions, 22 deletions
@@ -414,9 +414,6 @@ static void push_codec_src(Path path, CodecSrc::Mode mode, CodecSrc::DstColorTyp case CodecSrc::kGrayscale_Always_DstColorType: folder.append("_kGray8"); break; - case CodecSrc::kIndex8_Always_DstColorType: - folder.append("_kIndex8"); - break; case CodecSrc::kNonNative8888_Always_DstColorType: folder.append("_kNonNative"); break; @@ -452,9 +449,6 @@ static void push_android_codec_src(Path path, CodecSrc::DstColorType dstColorTyp case CodecSrc::kGrayscale_Always_DstColorType: folder.append("_kGray8"); break; - case CodecSrc::kIndex8_Always_DstColorType: - folder.append("_kIndex8"); - break; case CodecSrc::kNonNative8888_Always_DstColorType: folder.append("_kNonNative"); break; @@ -557,12 +551,6 @@ static void push_codec_srcs(Path path) { switch (codec->getInfo().colorType()) { case kGray_8_SkColorType: colorTypes.push_back(CodecSrc::kGrayscale_Always_DstColorType); - if (SkEncodedImageFormat::kWBMP == codec->getEncodedFormat()) { - colorTypes.push_back(CodecSrc::kIndex8_Always_DstColorType); - } - break; - case kIndex_8_SkColorType: - colorTypes.push_back(CodecSrc::kIndex8_Always_DstColorType); break; default: break; @@ -687,9 +675,6 @@ static void push_brd_src(Path path, CodecSrc::DstColorType dstColorType, BRDSrc: switch (dstColorType) { case CodecSrc::kGetFromCanvas_DstColorType: break; - case CodecSrc::kIndex8_Always_DstColorType: - folder.append("_kIndex"); - break; case CodecSrc::kGrayscale_Always_DstColorType: folder.append("_kGray"); break; @@ -707,14 +692,11 @@ static void push_brd_src(Path path, CodecSrc::DstColorType dstColorType, BRDSrc: } static void push_brd_srcs(Path path) { - // Only run Index8 and grayscale to one sampleSize and Mode. Though interesting - // to test these color types, they should not reveal anything across various + // Only run grayscale to one sampleSize and Mode. Though interesting + // to test grayscale, it should not reveal anything across various // sampleSizes and Modes - for (auto type : { CodecSrc::kIndex8_Always_DstColorType, - CodecSrc::kGrayscale_Always_DstColorType }) { - // Arbitrarily choose Mode and sampleSize. - push_brd_src(path, type, BRDSrc::kFullImage_Mode, 2); - } + // Arbitrarily choose Mode and sampleSize. + push_brd_src(path, CodecSrc::kGrayscale_Always_DstColorType, BRDSrc::kFullImage_Mode, 2); // Test on a variety of sampleSizes, making sure to include: |