hide SkImageDecoder::Chooser

src/images/SkImageDecoder_libwebp.cpp

 /*
  * Copyright 2010, The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ skipping 274 matching lines @@
     if (fHasAlpha) {
         if (colorType != kARGB_4444_SkColorType) {
             colorType = kN32_SkColorType;
         }
     } else {
         if (colorType != kRGB_565_SkColorType && colorType != kARGB_4444_SkColorType) {
             colorType = kN32_SkColorType;
         }
     }
 
+#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
     if (!this->chooseFromOneChoice(colorType, width, height)) {
         return false;
     }
+#endif
 
     SkAlphaType alphaType = kOpaque_SkAlphaType;
     if (SkToBool(fHasAlpha)) {
         if (this->getRequireUnpremultipliedColors()) {
             alphaType = kUnpremul_SkAlphaType;
         } else {
             alphaType = kPremul_SkAlphaType;
         }
     }
     return decodedBitmap->setInfo(SkImageInfo::Make(width, height, colorType, alphaType));
@@ skipping 64 matching lines @@
         if (!setDecodeConfig(bitmap, width, height)) {
             return false;
         }
         // alloc from native heap if it is a temp bitmap. (prevent GC)
         bool allocResult = (bitmap == decodedBitmap)
                                ? allocPixelRef(bitmap, NULL)
                                : bitmap->allocPixels();
         if (!allocResult) {
             return return_false(*decodedBitmap, "allocPixelRef");
         }
+#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
     } else {
         // This is also called in setDecodeConfig in above block.
         // i.e., when bitmap->isNull() is true.
         if (!chooseFromOneChoice(bitmap->colorType(), width, height)) {
             return false;
         }
+#endif
     }
 
     SkAutoLockPixels alp(*bitmap);
     WebPDecoderConfig config;
     if (!webp_get_config_resize_crop(&config, bitmap, rect,
                                      this->shouldPremultiply())) {
         return false;
     }
 
     // Decode the WebP image data stream using WebP incremental decoding for
@@ skipping 281 matching lines @@
     return SkImageDecoder::kUnknown_Format;
 }
 
 static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) {
       return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NULL;
 }
 
 static SkImageDecoder_DecodeReg gDReg(sk_libwebp_dfactory);
 static SkImageDecoder_FormatReg gFormatReg(get_format_webp);
 static SkImageEncoder_EncodeReg gEReg(sk_libwebp_efactory);