Allow Srcs to veto Sinks based on their broad type.

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 "SkCodec.h"
@@ skipping 53 matching lines @@
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 CodecSrc::CodecSrc(Path path, Mode mode, DstColorType dstColorType, float scale)
     : fPath(path)
     , fMode(mode)
     , fDstColorType(dstColorType)
     , fScale(scale)
 {}
 
+bool CodecSrc::veto(SinkType type) const {
+    // No need to test decoding to non-raster backend.
+    // TODO: Once we implement GPU paths (e.g. JPEG YUV), we should use a deferred decode to
+    // let the GPU handle it.
+    return type != kRaster_SinkType;
+}
+
 Error CodecSrc::draw(SkCanvas* canvas) const {
-    SkImageInfo canvasInfo;
-    if (NULL == canvas->peekPixels(&canvasInfo, NULL)) {
-        // TODO: Once we implement GPU paths (e.g. JPEG YUV), we should use a deferred decode to
-        // let the GPU handle it.
-        return Error::Nonfatal("No need to test decoding to non-raster backend.");
-    }
+    SkImageInfo canvasInfo = canvas->imageInfo();

[scroggo, 2015/07/17 14:10:48]

nit: We now only use canvasInfo once, down below. We could remove this line, and
make the below say

SkColorType = canvas->imageInfo().colorType();

 
     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
     if (!encoded) {
         return SkStringPrintf("Couldn't read %s.", fPath.c_str());
     }
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
     if (NULL == codec.get()) {
         return SkStringPrintf("Couldn't create codec for %s.", fPath.c_str());
     }
 
@@ skipping 284 matching lines @@
         return SkOSPath::Basename(fPath.c_str());
     } else {
         return SkStringPrintf("%s_%.3f", SkOSPath::Basename(fPath.c_str()).c_str(), fScale);
     }
 }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 ImageSrc::ImageSrc(Path path, int divisor) : fPath(path), fDivisor(divisor) {}
 
+bool ImageSrc::veto(SinkType type) const {
+    // No need to test decoding to non-raster backend.
+    // TODO: Instead, use lazy decoding to allow the GPU to handle cases like YUV.
+    return type != kRaster_SinkType;
+}
+
 Error ImageSrc::draw(SkCanvas* canvas) const {
-    SkImageInfo canvasInfo;
-    if (NULL == canvas->peekPixels(&canvasInfo, NULL)) {
-        // TODO: Instead, use lazy decoding to allow the GPU to handle cases like YUV.
-        return Error::Nonfatal("No need to test decoding to non-raster backend.");
-    }
+    SkImageInfo canvasInfo = canvas->imageInfo();
 
     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
     if (!encoded) {
         return SkStringPrintf("Couldn't read %s.", fPath.c_str());
     }
     const SkColorType dstColorType = canvasInfo.colorType();

[scroggo, 2015/07/17 14:10:48]

Again, canvasInfo is not needed as its own variable (only referenced once).

     if (fDivisor == 0) {
         // Decode the full image.
         SkBitmap bitmap;
         if (!SkImageDecoder::DecodeMemory(encoded->data(), encoded->size(), &bitmap,
                                           dstColorType, SkImageDecoder::kDecodePixels_Mode)) {
             return SkStringPrintf("Couldn't decode %s.", fPath.c_str());
         }
         if (kRGB_565_SkColorType == dstColorType && !bitmap.isOpaque()) {
             // Do not draw a bitmap with alpha to a destination without alpha.
             return Error::Nonfatal("Uninteresting to decode image with alpha into 565.");
@@ skipping 582 matching lines @@
             skr.visit<void>(i, drawsAsSingletonPictures);
         }
         SkAutoTUnref<SkPicture> macroPic(macroRec.endRecordingAsPicture());
 
         canvas->drawPicture(macroPic);
         return "";
     });
 }
 
 }  // namespace DM