eliminate code related to SkBitmap::Config

BUG=skia:
R=reed@google.com, mike@reedtribe.org

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/483593002

4 files changed, 0 insertions, 105 deletions

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index e675db2800..d83199ddc4 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -91,12 +91,6 @@ void SkBitmap::reset() {
     sk_bzero(this, sizeof(*this));
 }
 
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-SkBitmap::Config SkBitmap::config() const {
-    return SkColorTypeToBitmapConfig(fInfo.colorType());
-}
-#endif
-
 void SkBitmap::getBounds(SkRect* bounds) const {
     SkASSERT(bounds);
     bounds->set(0, 0,
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 308c3fe7ab..085ad2bf8a 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -428,26 +428,6 @@ void GrUnlockAndUnrefCachedBitmapTexture(GrTexture* texture) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-GrPixelConfig SkBitmapConfig2GrPixelConfig(SkBitmap::Config config) {
-    switch (config) {
-        case SkBitmap::kA8_Config:
-            return kAlpha_8_GrPixelConfig;
-        case SkBitmap::kIndex8_Config:
-            return kIndex_8_GrPixelConfig;
-        case SkBitmap::kRGB_565_Config:
-            return kRGB_565_GrPixelConfig;
-        case SkBitmap::kARGB_4444_Config:
-            return kRGBA_4444_GrPixelConfig;
-        case SkBitmap::kARGB_8888_Config:
-            return kSkia8888_GrPixelConfig;
-        default:
-            // kNo_Config, kA1_Config missing
-            return kUnknown_GrPixelConfig;
-    }
-}
-#endif
-
 // alphatype is ignore for now, but if GrPixelConfig is expanded to encompass
 // alpha info, that will be considered.
 GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType ct, SkAlphaType) {
diff --git a/src/image/SkImagePriv.cpp b/src/image/SkImagePriv.cpp
index f5b785877c..bde47e71eb 100644
--- a/src/image/SkImagePriv.cpp
+++ b/src/image/SkImagePriv.cpp
@@ -9,45 +9,6 @@
 #include "SkCanvas.h"
 #include "SkPicture.h"
 
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType colorType) {
-    switch (colorType) {
-        case kAlpha_8_SkColorType:
-            return SkBitmap::kA8_Config;
-
-        case kARGB_4444_SkColorType:
-            return SkBitmap::kARGB_4444_Config;
-
-        case kRGB_565_SkColorType:
-            return SkBitmap::kRGB_565_Config;
-
-        case kN32_SkColorType:
-            return SkBitmap::kARGB_8888_Config;
-
-        case kIndex_8_SkColorType:
-            return SkBitmap::kIndex8_Config;
-
-        default:
-            // break for unsupported colortypes
-            break;
-    }
-    return SkBitmap::kNo_Config;
-}
-
-SkColorType SkBitmapConfigToColorType(SkBitmap::Config config) {
-    static const SkColorType gCT[] = {
-        kUnknown_SkColorType,   // kNo_Config
-        kAlpha_8_SkColorType,   // kA8_Config
-        kIndex_8_SkColorType,   // kIndex8_Config
-        kRGB_565_SkColorType,   // kRGB_565_Config
-        kARGB_4444_SkColorType, // kARGB_4444_Config
-        kN32_SkColorType,   // kARGB_8888_Config
-    };
-    SkASSERT((unsigned)config < SK_ARRAY_COUNT(gCT));
-    return gCT[config];
-}
-#endif
-
 SkImage* SkNewImageFromBitmap(const SkBitmap& bm, bool canSharePixelRef) {
     const SkImageInfo info = bm.info();
     if (kUnknown_SkColorType == info.colorType()) {
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index 0e2018c117..ed2ad164a1 100644
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -24,9 +24,6 @@ SkImageDecoder::SkImageDecoder()
     , fDefaultPref(kUnknown_SkColorType)
     , fPreserveSrcDepth(false)
     , fDitherImage(true)
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-    , fUsePrefTable(false)
-#endif
     , fSkipWritingZeroes(false)
     , fPreferQualityOverSpeed(false)
     , fRequireUnpremultipliedColors(false) {
@@ -50,13 +47,6 @@ void SkImageDecoder::copyFieldsToOther(SkImageDecoder* other) {
 #endif
     other->setAllocator(fAllocator);
     other->setSampleSize(fSampleSize);
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-    if (fUsePrefTable) {
-        other->setPrefConfigTable(fPrefTable);
-    } else {
-        other->fDefaultPref = fDefaultPref;
-    }
-#endif
     other->setPreserveSrcDepth(fPreserveSrcDepth);
     other->setDitherImage(fDitherImage);
     other->setSkipWritingZeroes(fSkipWritingZeroes);
@@ -148,38 +138,8 @@ bool SkImageDecoder::allocPixelRef(SkBitmap* bitmap,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-void SkImageDecoder::setPrefConfigTable(const PrefConfigTable& prefTable) {
-    fUsePrefTable = true;
-    fPrefTable = prefTable;
-}
-#endif
-
-// TODO: use colortype in fPrefTable, fDefaultPref so we can stop using SkBitmapConfigToColorType()
-//
 SkColorType SkImageDecoder::getPrefColorType(SrcDepth srcDepth, bool srcHasAlpha) const {
     SkColorType ct = fDefaultPref;
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-    if (fUsePrefTable) {
-        // Until we kill or change the PrefTable, we have to go into Config land for a moment.
-        SkBitmap::Config config = SkBitmap::kNo_Config;
-        switch (srcDepth) {
-            case kIndex_SrcDepth:
-                config = srcHasAlpha ? fPrefTable.fPrefFor_8Index_YesAlpha_src
-                                     : fPrefTable.fPrefFor_8Index_NoAlpha_src;
-                break;
-            case k8BitGray_SrcDepth:
-                config = fPrefTable.fPrefFor_8Gray_src;
-                break;
-            case k32Bit_SrcDepth:
-                config = srcHasAlpha ? fPrefTable.fPrefFor_8bpc_YesAlpha_src
-                                     : fPrefTable.fPrefFor_8bpc_NoAlpha_src;
-                break;
-        }
-        // now return to SkColorType land
-        ct = SkBitmapConfigToColorType(config);
-    }
-#endif
     if (fPreserveSrcDepth) {
         switch (srcDepth) {
             case kIndex_SrcDepth: