| Index: dm/DM.cpp
|
| diff --git a/dm/DM.cpp b/dm/DM.cpp
|
| index 0faca8f7c3e1f1250cbf4971910cf0d37faa890f..2c223a85ee3ec835601a70dd147f467f91ec87a7 100644
|
| --- a/dm/DM.cpp
|
| +++ b/dm/DM.cpp
|
| @@ -356,6 +356,15 @@ static bool brd_color_type_supported(SkBitmapRegionDecoderInterface::Strategy st
|
| default:
|
| return false;
|
| }
|
| + case SkBitmapRegionDecoderInterface::kCodec_Strategy:
|
| + switch (dstColorType) {
|
| + case CodecSrc::kGetFromCanvas_DstColorType:
|
| + case CodecSrc::kIndex8_Always_DstColorType:
|
| + case CodecSrc::kGrayscale_Always_DstColorType:
|
| + return true;
|
| + default:
|
| + return false;
|
| + }
|
| default:
|
| SkASSERT(false);
|
| return false;
|
| @@ -372,6 +381,9 @@ static void push_brd_src(Path path, SkBitmapRegionDecoderInterface::Strategy str
|
| case SkBitmapRegionDecoderInterface::kOriginal_Strategy:
|
| folder.append("brd_sample");
|
| break;
|
| + case SkBitmapRegionDecoderInterface::kCodec_Strategy:
|
| + folder.append("brd_codec");
|
| + break;
|
| default:
|
| SkASSERT(false);
|
| return;
|
| @@ -414,7 +426,8 @@ static void push_brd_srcs(Path path) {
|
|
|
| const SkBitmapRegionDecoderInterface::Strategy strategies[] = {
|
| SkBitmapRegionDecoderInterface::kCanvas_Strategy,
|
| - SkBitmapRegionDecoderInterface::kOriginal_Strategy
|
| + SkBitmapRegionDecoderInterface::kOriginal_Strategy,
|
| + SkBitmapRegionDecoderInterface::kCodec_Strategy,
|
| };
|
|
|
| const uint32_t sampleSizes[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
|
| @@ -422,14 +435,14 @@ static void push_brd_srcs(Path path) {
|
| // We will only test to one backend (8888), but we will test all of the
|
| // color types that we need to decode to on this backend.
|
| const CodecSrc::DstColorType dstColorTypes[] = {
|
| - CodecSrc::kGetFromCanvas_DstColorType,
|
| - CodecSrc::kIndex8_Always_DstColorType,
|
| - CodecSrc::kGrayscale_Always_DstColorType,
|
| + CodecSrc::kGetFromCanvas_DstColorType,
|
| + CodecSrc::kIndex8_Always_DstColorType,
|
| + CodecSrc::kGrayscale_Always_DstColorType,
|
| };
|
|
|
| const BRDSrc::Mode modes[] = {
|
| - BRDSrc::kFullImage_Mode,
|
| - BRDSrc::kDivisor_Mode
|
| + BRDSrc::kFullImage_Mode,
|
| + BRDSrc::kDivisor_Mode
|
| };
|
|
|
| for (SkBitmapRegionDecoderInterface::Strategy strategy : strategies) {
|
|
|