Only support jpeg, png, and webp for BRD

src/android/SkBitmapRegionDecoder.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 "SkBitmapRegionCanvas.h"
 #include "SkBitmapRegionCodec.h"
 #include "SkBitmapRegionDecoder.h"
@@ skipping 12 matching lines @@
         SkStreamRewindable* stream, Strategy strategy) {
     SkAutoTDelete<SkStreamRewindable> streamDeleter(stream);
     switch (strategy) {
         case kCanvas_Strategy: {
             SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(streamDeleter.detach()));
             if (nullptr == codec) {
                 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;
+            SkEncodedFormat format = codec->getEncodedFormat();
+            switch (format) {
+                case SkEncodedFormat::kJPEG_SkEncodedFormat:
+                case SkEncodedFormat::kPNG_SkEncodedFormat:
+                    break;
+                default:
+                    // FIXME: Support webp using a special case.  Webp does not support
+                    //        scanline decoding.
+                    return nullptr;
             }
 
-            switch (codec->getScanlineOrder()) {

[scroggo, 2015/11/16 14:20:06]

I suppose you took this out because we should never hit the other orderings so
long as we're using png or jpeg. Can we at least leave it in as an assert? 

[msarett, 2015/11/16 14:27:51]

Yes you're right.  Sounds good to me.

-                case SkCodec::kTopDown_SkScanlineOrder:
-                case SkCodec::kNone_SkScanlineOrder:
-                    break;
-                default:
-                    SkCodecPrintf("Error: Scanline ordering not supported.\n");
-                    return nullptr;
-            }
             return new SkBitmapRegionCanvas(codec.detach());
         }
         case kAndroidCodec_Strategy: {
             SkAutoTDelete<SkAndroidCodec> codec =
                     SkAndroidCodec::NewFromStream(streamDeleter.detach());
-            if (NULL == codec) {
+            if (nullptr == codec) {
                 SkCodecPrintf("Error: Failed to create codec.\n");
                 return NULL;
             }
+
+            SkEncodedFormat format = codec->getEncodedFormat();
+            switch (format) {
+                case SkEncodedFormat::kJPEG_SkEncodedFormat:
+                case SkEncodedFormat::kPNG_SkEncodedFormat:
+                case SkEncodedFormat::kWEBP_SkEncodedFormat:
+                    break;
+                default:
+                    return nullptr;
+            }
+
             return new SkBitmapRegionCodec(codec.detach());
         }
         default:
             SkASSERT(false);
             return nullptr;
     }
 }