hide SkBitmap::Config entirely (behind a flag)

include/core/SkImageDecoder.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImageDecoder_DEFINED
 #define SkImageDecoder_DEFINED
 
@@ skipping 141 matching lines @@
         virtual int choose() = 0;
 
     private:
         typedef SkRefCnt INHERITED;
     };
 
     Chooser* getChooser() const { return fChooser; }
     Chooser* setChooser(Chooser*);
 #endif
 
+#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
     /**
      *  Optional table describing the caller's preferred config based on
      *  information about the src data. Each field should be set to the
      *  preferred config for a src described in the name of the field. The
      *  src attributes are described in terms of depth (8-index,
      *  8bit-grayscale, or 8-bits/component) and whether there is per-pixel
      *  alpha (does not apply to grayscale). If the caller has no preference
      *  for a particular src type, its slot should be set to kNo_Config.
      *
      *  NOTE ABOUT PREFERRED CONFIGS:
@@ skipping 23 matching lines @@
      *  decode is preferred.
      */
     void setPrefConfigTable(const PrefConfigTable&);
 
     /**
      *  Do not use a PrefConfigTable to determine the output config. This
      *  is the default, so there is no need to call unless a PrefConfigTable
      *  was previously set.
      */
     void resetPrefConfigTable() { fUsePrefTable = false; }
+#endif
 
     SkBitmap::Allocator* getAllocator() const { return fAllocator; }
     SkBitmap::Allocator* setAllocator(SkBitmap::Allocator*);
 
     // sample-size, if set to > 1, tells the decoder to return a smaller than
     // original bitmap, sampling 1 pixel for every size pixels. e.g. if sample
     // size is set to 3, then the returned bitmap will be 1/3 as wide and high,
     // and will contain 1/9 as many pixels as the original.
     // Note: this is a hint, and the codec may choose to ignore this, or only
     // approximate the sample size.
@@ skipping 249 matching lines @@
     SkColorType getPrefColorType(SrcDepth, bool hasAlpha) const;
 
 private:
     Peeker*                 fPeeker;
 #ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
     Chooser*                fChooser;
 #endif
     SkBitmap::Allocator*    fAllocator;
     int                     fSampleSize;
     SkColorType             fDefaultPref;   // use if fUsePrefTable is false
+#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
     PrefConfigTable         fPrefTable;     // use if fUsePrefTable is true
+    bool                    fUsePrefTable;
+#endif
     bool                    fDitherImage;
-    bool                    fUsePrefTable;
     bool                    fSkipWritingZeroes;
     mutable bool            fShouldCancelDecode;
     bool                    fPreferQualityOverSpeed;
     bool                    fRequireUnpremultipliedColors;
 };
 
 /** Calling newDecoder with a stream returns a new matching imagedecoder
     instance, or NULL if none can be found. The caller must manage its ownership
     of the stream as usual, calling unref() when it is done, as the returned
     decoder may have called ref() (and if so, the decoder is responsible for
@@ skipping 40 matching lines @@
 DECLARE_DECODER_CREATOR(WEBPImageDecoder);
 DECLARE_DECODER_CREATOR(PKMImageDecoder);
 DECLARE_DECODER_CREATOR(KTXImageDecoder);
 
 // Typedefs to make registering decoder and formatter callbacks easier.
 // These have to be defined outside SkImageDecoder. :(
 typedef SkTRegistry<SkImageDecoder*(*)(SkStreamRewindable*)>        SkImageDecoder_DecodeReg;
 typedef SkTRegistry<SkImageDecoder::Format(*)(SkStreamRewindable*)> SkImageDecoder_FormatReg;
 
 #endif