aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
authorGravatar brianosman <brianosman@google.com>2016-03-24 07:27:43 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-24 07:27:43 -0700
commitc9ced392132711205af9011b1112cac3137daf09 (patch)
tree24f615b5313cb2b200bb9fc3a294821f6870bb1a /dm
parent2302de920e5434809bd0e85b871a6e002856dfdb (diff)
https://codereview.chromium.org/1830973002 fixed this bug. Re-enable the
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp5
-rw-r--r--dm/DMSrcSink.cpp4
2 files changed, 1 insertions, 8 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 9b3a42f48b..ce3a1aa77e 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -589,10 +589,7 @@ static void push_codec_srcs(Path path) {
}
// Push image generator GPU test.
- // FIXME: The gpu backend does not draw kGray sources correctly. (skbug.com/4822)
- if (kGray_8_SkColorType != codec->getInfo().colorType()) {
- push_image_gen_src(path, ImageGenSrc::kCodec_Mode, codec->getInfo().alphaType(), true);
- }
+ push_image_gen_src(path, ImageGenSrc::kCodec_Mode, codec->getInfo().alphaType(), true);
// Push image generator CPU tests.
for (SkAlphaType alphaType : alphaModes) {
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 78782a0866..1cffb3cfb5 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -831,10 +831,6 @@ Error ImageGenSrc::draw(SkCanvas* canvas) const {
// Test deferred decoding path on GPU
if (fIsGpu) {
- // FIXME: The gpu backend does not draw kGray sources correctly. (skbug.com/4822)
- // We have disabled these tests in DM.cpp.
- SkASSERT(kGray_8_SkColorType != gen->getInfo().colorType());
-
sk_sp<SkImage> image(SkImage::MakeFromGenerator(gen.release(), nullptr));
if (!image) {
return "Could not create image from codec image generator.";