| Index: src/android/SkBitmapRegionDecoder.cpp
|
| diff --git a/src/android/SkBitmapRegionDecoder.cpp b/src/android/SkBitmapRegionDecoder.cpp
|
| index 101efbda452c49a2e4b9c695246b806ff56025e5..324d1be4a461241e1304f29d7de7b82b490d5a13 100644
|
| --- a/src/android/SkBitmapRegionDecoder.cpp
|
| +++ b/src/android/SkBitmapRegionDecoder.cpp
|
| @@ -5,7 +5,6 @@
|
| * found in the LICENSE file.
|
| */
|
|
|
| -#include "SkBitmapRegionCanvas.h"
|
| #include "SkBitmapRegionCodec.h"
|
| #include "SkBitmapRegionDecoder.h"
|
| #include "SkAndroidCodec.h"
|
| @@ -22,32 +21,6 @@ SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create(
|
| SkStreamRewindable* stream, Strategy strategy) {
|
| SkAutoTDelete<SkStreamRewindable> streamDeleter(stream);
|
| switch (strategy) {
|
| - case kCanvas_Strategy: {
|
| - SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(streamDeleter.release()));
|
| - if (nullptr == codec) {
|
| - SkCodecPrintf("Error: Failed to create decoder.\n");
|
| - 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;
|
| - }
|
| -
|
| - // If the image is a jpeg or a png, the scanline ordering should always be
|
| - // kTopDown or kNone. It is relevant to check because this implementation
|
| - // only supports these two scanline orderings.
|
| - SkASSERT(SkCodec::kTopDown_SkScanlineOrder == codec->getScanlineOrder() ||
|
| - SkCodec::kNone_SkScanlineOrder == codec->getScanlineOrder());
|
| -
|
| - return new SkBitmapRegionCanvas(codec.release());
|
| - }
|
| case kAndroidCodec_Strategy: {
|
| SkAutoTDelete<SkAndroidCodec> codec =
|
| SkAndroidCodec::NewFromStream(streamDeleter.release());
|
|
|