move all Config specific APIs into SkBitmapConfig.cpp -- Config is deprecated

src/images/SkImageDecoder.cpp

 /*
  * 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.
  */
 
 
 #include "SkImageDecoder.h"
 #include "SkBitmap.h"
 #include "SkImagePriv.h"
 #include "SkPixelRef.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
 #include "SkCanvas.h"
 
 static SkBitmap::Config gDeviceConfig = SkBitmap::kNo_Config;
 
+#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CONFIG
 SkBitmap::Config SkImageDecoder::GetDeviceConfig()
 {
     return gDeviceConfig;
 }
 
 void SkImageDecoder::SetDeviceConfig(SkBitmap::Config config)
 {
     gDeviceConfig = config;
 }
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkImageDecoder::SkImageDecoder()
     : fPeeker(NULL)
     , fChooser(NULL)
     , fAllocator(NULL)
     , fSampleSize(1)
     , fDefaultPref(SkBitmap::kNo_Config)
     , fDitherImage(true)
@@ skipping 75 matching lines @@
     return alloc;
 }
 
 void SkImageDecoder::setSampleSize(int size) {
     if (size < 1) {
         size = 1;
     }
     fSampleSize = size;
 }
 
+#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CONFIG
 bool SkImageDecoder::chooseFromOneChoice(SkBitmap::Config config, int width,
                                          int height) const {
+    return this->chooseFromOneChoice(SkBitmapConfigToColorType(config),
+                                     width, height);
+}
+#endif
+bool SkImageDecoder::chooseFromOneChoice(SkColorType colorType,
+                                         int width, int height) const {
     Chooser* chooser = fChooser;
-
+    
     if (NULL == chooser) {    // no chooser, we just say YES to decoding :)
         return true;
     }
     chooser->begin(1);
-    chooser->inspect(0, config, width, height);
+    chooser->inspect(0, colorType, width, height);
     return chooser->choose() == 0;
 }
 
 bool SkImageDecoder::allocPixelRef(SkBitmap* bitmap,
                                    SkColorTable* ctable) const {
     return bitmap->allocPixels(fAllocator, ctable);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ skipping 23 matching lines @@
     } else {
         config = fDefaultPref;
     }
 
     if (SkBitmap::kNo_Config == config) {
         config = SkImageDecoder::GetDeviceConfig();
     }
     return config;
 }
 
+#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CONFIG
 bool SkImageDecoder::decode(SkStream* stream, SkBitmap* bm,
                             SkBitmap::Config pref, Mode mode) {
+    return this->decode(stream, bm, SkBitmapConfigToColorType(pref), mode);
+}
+#endif
+
+bool SkImageDecoder::decode(SkStream* stream, SkBitmap* bm,
+                            SkColorType colorType, Mode mode) {
     // we reset this to false before calling onDecode
     fShouldCancelDecode = false;
     // assign this, for use by getPrefConfig(), in case fUsePrefTable is false
-    fDefaultPref = pref;
-
+    fDefaultColorType = colorType;
+    
     // pass a temporary bitmap, so that if we return false, we are assured of
     // leaving the caller's bitmap untouched.
     SkBitmap    tmp;
     if (!this->onDecode(stream, &tmp, mode)) {
         return false;
     }
     bm->swap(tmp);
     return true;
 }
 
@@ skipping 106 matching lines @@
             if (kUnknown_Format == *format) {
                 if (stream->rewind()) {
                     *format = GetStreamFormat(stream);
                 }
             }
         }
         delete codec;
     }
     return success;
 }