Index: dm/DM.cpp |
diff --git a/dm/DM.cpp b/dm/DM.cpp |
index e616c187047350bd673a243116ce1aab5a8822e1..fd4c9e122f1dcbaf7fe6ed0dd1d7ea776db53818 100644 |
--- a/dm/DM.cpp |
+++ b/dm/DM.cpp |
@@ -354,6 +354,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; |
@@ -370,6 +379,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; |
@@ -412,7 +424,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 }; |
@@ -420,14 +433,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) { |