Refactor SkBitmapRegionDecoderInterface for Android

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 107 matching lines @@
     }
 
     const uint32_t width = brd->width();
     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: {
-            SkAutoTDelete<SkBitmap> bitmap(brd->decodeRegion(0, 0, width, height, fSampleSize,
-                    colorType));
-            if (nullptr == bitmap.get() || colorType != bitmap->colorType()) {
+            SkBitmap bitmap;
+            if (!brd->decodeRegion(&bitmap, nullptr, SkIRect::MakeXYWH(0, 0, width, height),
+                    fSampleSize, colorType, false)) {
+                // FIXME: Make this a fatal error.

[scroggo, 2015/10/27 18:53:55]

Why is this not fatal, and what do you need to do to make it a fatal error?
(Same below)

[msarett, 2015/10/27 19:06:16]

I *think* the only thing that needs to be done is to disable webps for
Canvas_Strategy.  Canvas_Strategy uses a scanline decoder.

I was going to make it fatal in this CL, but I realized that it would require an
additional change and didn't want to add too much in one go.

A bad color conversion in kOriginal_Strategy may also fail here.  I know that
some of the time, they will just decode to a default colorType, but I'm not sure
if it's all of the time.

[scroggo, 2015/10/27 19:23:37]

I'm fine if that is left to a separate change, but can you update the comment
with more details and file a bug?

+                return Error::Nonfatal("Cannot decode region.\n");
+            }
+            if (colorType != bitmap.colorType()) {
                 return Error::Nonfatal("Cannot convert to color type.\n");
             }
-            canvas->drawBitmap(*bitmap, 0, 0);
+            canvas->drawBitmap(bitmap, 0, 0);
             return "";
         }
         case kDivisor_Mode: {
             const uint32_t divisor = 2;
             if (width < divisor || height < divisor) {
                 return Error::Nonfatal("Divisor is larger than image dimension.\n");
             }
 
             // Use a border to test subsets that extend outside the image.
             // We will not allow the border to be larger than the image dimensions.  Allowing
@@ skipping 27 matching lines @@
                     // Increase the size of the last subset in each row or column, when the
                     // divisor does not divide evenly into the image dimensions
                     subsetWidth += (x + 1 == divisor) ? (width % divisor) : 0;
                     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;
-                    SkAutoTDelete<SkBitmap> bitmap(brd->decodeRegion(decodeLeft,
-                            decodeTop, decodeWidth, decodeHeight, fSampleSize, colorType));
-                    if (nullptr == bitmap.get() || colorType != bitmap->colorType()) {
+                    SkBitmap bitmap;
+                    if (!brd->decodeRegion(&bitmap, nullptr, SkIRect::MakeXYWH(decodeLeft,
+                            decodeTop, decodeWidth, decodeHeight), fSampleSize, colorType, false)) {
+                        // FIXME: Make this a fatal error.
+                        return Error::Nonfatal("Cannot not decode region.\n");
+                    }
+                    if (colorType != bitmap.colorType()) {
                         return Error::Nonfatal("Cannot convert to color type.\n");
                     }
 
-                    canvas->drawBitmapRect(*bitmap,
+                    canvas->drawBitmapRect(bitmap,
                             SkRect::MakeXYWH((SkScalar) scaledBorder, (SkScalar) scaledBorder,
                                     (SkScalar) (subsetWidth / fSampleSize),
                                     (SkScalar) (subsetHeight / fSampleSize)),
                             SkRect::MakeXYWH((SkScalar) (left / fSampleSize),
                                     (SkScalar) (top / fSampleSize),
                                     (SkScalar) (subsetWidth / fSampleSize),
                                     (SkScalar) (subsetHeight / fSampleSize)),
                             nullptr);
                 }
             }
@@ skipping 1170 matching lines @@
             skr.visit<void>(i, drawsAsSingletonPictures);
         }
         SkAutoTUnref<SkPicture> macroPic(macroRec.endRecordingAsPicture());
 
         canvas->drawPicture(macroPic);
         return "";
     });
 }
 
 }  // namespace DM