From 9803e0c522ed69c9204fcfc4893ab1d63266836b Mon Sep 17 00:00:00 2001
From: Nigel Tao <nigeltao@google.com>
Date: Wed, 7 Nov 2018 12:54:21 +1100
Subject: [PATCH] Remove some #ifdef's from SkAndroidCodec

SkSampledCodec is always defined, and if we got a codec that claims to
be one of these (PNG, ICO, JPEG, GIF, BMP, WBMP, HEIF), we should pass
it to SkSampledCodec.

Bug: skia:
Change-Id: Id2e3a1798cb5aaaf4d44f019b665b6ece463097e
Reviewed-on: https://skia-review.googlesource.com/c/168540
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
---
 src/codec/SkAndroidCodec.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp
index 7ac242d125..10d19f34ee 100644
--- a/src/codec/SkAndroidCodec.cpp
+++ b/src/codec/SkAndroidCodec.cpp
@@ -89,19 +89,13 @@ std::unique_ptr<SkAndroidCodec> SkAndroidCodec::MakeFromCodec(std::unique_ptr<Sk
     }
 
     switch ((SkEncodedImageFormat)codec->getEncodedFormat()) {
-#ifdef SK_HAS_PNG_LIBRARY
         case SkEncodedImageFormat::kPNG:
         case SkEncodedImageFormat::kICO:
-#endif
-#ifdef SK_HAS_JPEG_LIBRARY
         case SkEncodedImageFormat::kJPEG:
-#endif
         case SkEncodedImageFormat::kGIF:
         case SkEncodedImageFormat::kBMP:
         case SkEncodedImageFormat::kWBMP:
-#ifdef SK_HAS_HEIF_LIBRARY
         case SkEncodedImageFormat::kHEIF:
-#endif
             return skstd::make_unique<SkSampledCodec>(codec.release(), orientationBehavior);
 #ifdef SK_HAS_WEBP_LIBRARY
         case SkEncodedImageFormat::kWEBP: