| Index: dm/DMSrcSink.cpp
|
| diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
|
| index b14c57367908229782086112ae76c57f041db84f..1a845507d6c4258d85026f0ff5ce47450d9aee9e 100644
|
| --- a/dm/DMSrcSink.cpp
|
| +++ b/dm/DMSrcSink.cpp
|
| @@ -128,10 +128,7 @@ Error BRDSrc::draw(SkCanvas* canvas) const {
|
| SkBitmap bitmap;
|
| if (!brd->decodeRegion(&bitmap, nullptr, SkIRect::MakeXYWH(0, 0, width, height),
|
| fSampleSize, colorType, false)) {
|
| - // FIXME: Make this a fatal error. We need to disable webps for kCanvas_Strategy
|
| - // because we have not implemented kCanvas_Strategy for webp. We may also need to
|
| - // deal with color conversion errors for kOriginal_Strategy.
|
| - return Error::Nonfatal("Cannot decode region.\n");
|
| + return "Cannot decode region.\n";
|
| }
|
| if (colorType != bitmap.colorType()) {
|
| return Error::Nonfatal("Cannot convert to color type.\n");
|
| @@ -187,11 +184,7 @@ Error BRDSrc::draw(SkCanvas* canvas) const {
|
| SkBitmap bitmap;
|
| if (!brd->decodeRegion(&bitmap, nullptr, SkIRect::MakeXYWH(decodeLeft,
|
| decodeTop, decodeWidth, decodeHeight), fSampleSize, colorType, false)) {
|
| - // FIXME: Make this a fatal error. We need to disable webps for
|
| - // kCanvas_Strategy because we have not implemented kCanvas_Strategy for
|
| - // webp. We may also need to deal with color conversion errors for
|
| - // kOriginal_Strategy.
|
| - return Error::Nonfatal("Cannot not decode region.\n");
|
| + return "Cannot not decode region.\n";
|
| }
|
| if (colorType != bitmap.colorType()) {
|
| return Error::Nonfatal("Cannot convert to color type.\n");
|
|
|