commit c37799282ff7dc8cbec7e2b7ed2f6df6cdddf6a6
author msarett <msarett@google.com> Tue Oct 27 13:28:25 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Oct 27 13:28:25 2015 -0700
tree 1e4445c316fc8c7caa58050d3ab3316a338d2883
parent 3f65e93b19027e61a640a8f421dcd745146446f7

Make DMSrcSink fail fatally when decodeRegion() fails for BRDSrcs

This involves disabling webps for kCanvas_Strategy.
We have not yet implemented webp subset decodes for this
strategy.

BUG=skia:4521

Review URL: https://codereview.chromium.org/1405273004

tools/SkBitmapRegionDecoderInterface.cpp

diff --git a/tools/SkBitmapRegionDecoderInterface.cpp b/tools/SkBitmapRegionDecoderInterface.cpp
index 5941538..d009b27 100644
--- a/tools/SkBitmapRegionDecoderInterface.cpp
+++ b/tools/SkBitmapRegionDecoderInterface.cpp
@@ -44,6 +44,13 @@
                 SkCodecPrintf("Error: Failed to create decoder.\n");
                 return nullptr;
             }
+
+            if (SkEncodedFormat::kWEBP_SkEncodedFormat == codec->getEncodedFormat()) {
+                // FIXME: Support webp using a special case.  Webp does not support
+                //        scanline decoding.
+                return nullptr;
+            }
+
             switch (codec->getScanlineOrder()) {
                 case SkCodec::kTopDown_SkScanlineOrder:
                 case SkCodec::kNone_SkScanlineOrder: