diff options
author | scroggo <scroggo@chromium.org> | 2016-05-16 09:04:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-16 09:04:14 -0700 |
commit | f8dc9df9ab0a90b74d56df9583752a1c38ee20f4 (patch) | |
tree | 7dee1c73a7bce2303dfa5ecdbcb5a188e69f301f /dm/DM.cpp | |
parent | c99b8f0351850cc1901fe359feb4ca357141346f (diff) |
Drop AndroidCodecSrc::kDivisor_Mode
This is redundant with BRD tests.
BUG=skia:5307
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1976303002
Review-Url: https://codereview.chromium.org/1976303002
Diffstat (limited to 'dm/DM.cpp')
-rw-r--r-- | dm/DM.cpp | 37 |
1 files changed, 5 insertions, 32 deletions
@@ -394,17 +394,10 @@ static void push_codec_src(Path path, CodecSrc::Mode mode, CodecSrc::DstColorTyp push_src("image", folder, src); } -static void push_android_codec_src(Path path, AndroidCodecSrc::Mode mode, - CodecSrc::DstColorType dstColorType, SkAlphaType dstAlphaType, int sampleSize) { +static void push_android_codec_src(Path path, CodecSrc::DstColorType dstColorType, + SkAlphaType dstAlphaType, int sampleSize) { SkString folder; - switch (mode) { - case AndroidCodecSrc::kFullImage_Mode: - folder.append("scaled_codec"); - break; - case AndroidCodecSrc::kDivisor_Mode: - folder.append("scaled_codec_divisor"); - break; - } + folder.append("scaled_codec"); switch (dstColorType) { case CodecSrc::kGrayscale_Always_DstColorType: @@ -438,7 +431,7 @@ static void push_android_codec_src(Path path, AndroidCodecSrc::Mode mode, folder.appendf("_%.3f", 1.0f / (float) sampleSize); } - AndroidCodecSrc* src = new AndroidCodecSrc(path, mode, dstColorType, dstAlphaType, sampleSize); + AndroidCodecSrc* src = new AndroidCodecSrc(path, dstColorType, dstAlphaType, sampleSize); push_src("image", folder, src); } @@ -564,21 +557,6 @@ static void push_codec_srcs(Path path) { return; } - // https://bug.skia.org/4428 - bool subset = false; - // The following image types are supported by BitmapRegionDecoder, - // so we will test full image decodes and subset decodes. - static const char* const exts[] = { - "jpg", "jpeg", "png", "webp", - "JPG", "JPEG", "PNG", "WEBP", - }; - for (const char* ext : exts) { - if (path.endsWith(ext)) { - subset = true; - break; - } - } - const int sampleSizes[] = { 1, 2, 3, 4, 5, 6, 7, 8 }; for (int sampleSize : sampleSizes) { @@ -590,12 +568,7 @@ static void push_codec_srcs(Path path) { continue; } - push_android_codec_src(path, AndroidCodecSrc::kFullImage_Mode, colorType, - alphaType, sampleSize); - if (subset) { - push_android_codec_src(path, AndroidCodecSrc::kDivisor_Mode, colorType, - alphaType, sampleSize); - } + push_android_codec_src(path, colorType, alphaType, sampleSize); } } } |