hide SkImageDecoder::Chooser

src/images/SkImageDecoder_libico.cpp

Index: src/images/SkImageDecoder_libico.cpp
diff --git a/src/images/SkImageDecoder_libico.cpp b/src/images/SkImageDecoder_libico.cpp
index c6dd6f08367c8253ee08a6a3aee30859c4a441d7..e6ae16f0bd4c2cc73b79e4df94883412d85733c0 100644
--- a/src/images/SkImageDecoder_libico.cpp
+++ b/src/images/SkImageDecoder_libico.cpp
@@ -94,6 +94,7 @@ bool SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode)
     if (length < (size_t)(6 + count*16))
         return false;
 
+#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
     int choice;
     Chooser* chooser = this->getChooser();

[scroggo, 2014/06/11 17:11:23]

ICO is the prime example where the choice actually is meaningful, since an ICO
may contain multiple images - I think other image formats can support this as
well, but I don't know how many images use it in practice, and no clients use
it.

It might be nice to support this feature, but it's reasonable to wait for a
client to request it (which may give us a better idea of what the API should
look like).

     //FIXME:if no chooser, consider providing the largest color image
@@ -138,6 +139,9 @@ bool SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode)
     //you never know what the chooser is going to supply
     if (choice >= count || choice < 0)
         return false;
+#else
+    const int choice = 0;   // TODO: fold this value into the expressions below
+#endif
 
     //skip ahead to the correct header
     //commented out lines are not used, but if i switch to other read method, need to know how many to skip