commit 0af992941666d1e07d7de67062e459a198ef4810
author Mike Klein <mtklein@google.com> Wed May 15 22:02:05 2019 +0000
committer Mike Klein <mtklein@google.com> Wed May 15 22:02:14 2019 +0000
tree a3f30b81292ff38fd33ff41130b96686471cd120
parent c9deffaed22d556559a1358605ba3d39fe749918

Revert "remove #if guards in SkAndroidCodec.cpp"

This reverts commit 8ae07c319dc0be7fa490a9015d6b4e824c2ed21b.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> remove #if guards in SkAndroidCodec.cpp
> 
> I'm not sure I entirely understand what's going on here, but it looks
> like these removed guards aren't needed?  Can you walk me through what
> they're for?  I think they're getting in the way of runtime registered
> codecs working with SkAndroidCodec.
> 
> Change-Id: I078bfb77797b4a3419f02a20d77d0aa8d7bce09d
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/213876
> Commit-Queue: Mike Klein <mtklein@google.com>
> Reviewed-by: Leon Scroggins <scroggo@google.com>

TBR=mtklein@google.com,scroggo@google.com

Change-Id: I92883e0e8e334766b6004faf0801689d6f4cde9d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/214106
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

src/codec/SkAndroidCodec.cpp

diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp
index f988dfd..b90dbe7 100644
--- a/src/codec/SkAndroidCodec.cpp
+++ b/src/codec/SkAndroidCodec.cpp
@@ -98,13 +98,18 @@
         case SkEncodedImageFormat::kWBMP:
         case SkEncodedImageFormat::kHEIF:
             return skstd::make_unique<SkSampledCodec>(codec.release(), orientationBehavior);
-
 #ifdef SK_HAS_WUFFS_LIBRARY
         case SkEncodedImageFormat::kGIF:
 #endif
+#ifdef SK_HAS_WEBP_LIBRARY
         case SkEncodedImageFormat::kWEBP:
+#endif
+#ifdef SK_CODEC_DECODES_RAW
         case SkEncodedImageFormat::kDNG:
+#endif
+#if defined(SK_HAS_WEBP_LIBRARY) || defined(SK_CODEC_DECODES_RAW) || defined(SK_HAS_WUFFS_LIBRARY)
             return skstd::make_unique<SkAndroidCodecAdapter>(codec.release(), orientationBehavior);
+#endif
 
         default:
             return nullptr;