Make DMSrcSink fail fatally when decodeRegion() fails for BRDSrcs

dm/DMSrcSink.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkAndroidCodec.h"
@@ skipping 110 matching lines @@
     const uint32_t height = brd->height();
     // Visually inspecting very small output images is not necessary.
     if ((width / fSampleSize <= 10 || height / fSampleSize <= 10) && 1 != fSampleSize) {
         return Error::Nonfatal("Scaling very small images is uninteresting.");
     }
     switch (fMode) {
         case kFullImage_Mode: {
             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");
             }
             canvas->drawBitmap(bitmap, 0, 0);
             return "";
         }
         case kDivisor_Mode: {
             const uint32_t divisor = 2;
             if (width < divisor || height < divisor) {
@@ skipping 35 matching lines @@
                     subsetHeight += (y + 1 == divisor) ? (height % divisor) : 0;
 
                     // Increase the size of the subset in order to have a border on each side
                     const int decodeLeft = left - unscaledBorder;
                     const int decodeTop = top - unscaledBorder;
                     const uint32_t decodeWidth = subsetWidth + unscaledBorder * 2;
                     const uint32_t decodeHeight = subsetHeight + unscaledBorder * 2;
                     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");
                     }
 
                     canvas->drawBitmapRect(bitmap,
                             SkRect::MakeXYWH((SkScalar) scaledBorder, (SkScalar) scaledBorder,
                                     (SkScalar) (subsetWidth / fSampleSize),
                                     (SkScalar) (subsetHeight / fSampleSize)),
                             SkRect::MakeXYWH((SkScalar) (left / fSampleSize),
@@ skipping 1176 matching lines @@
             skr.visit<void>(i, drawsAsSingletonPictures);
         }
         SkAutoTUnref<SkPicture> macroPic(macroRec.endRecordingAsPicture());
 
         canvas->drawPicture(macroPic);
         return "";
     });
 }
 
 }  // namespace DM