promote SkImage::AlphaType to SkAlphaType

src/image/SkImagePriv.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImagePriv.h"
 #include "SkCanvas.h"
 #include "SkPicture.h"
 
 SkBitmap::Config SkImageInfoToBitmapConfig(const SkImage::Info& info,
                                            bool* isOpaque) {
     switch (info.fColorType) {
         case SkImage::kAlpha_8_ColorType:
             switch (info.fAlphaType) {
-                case SkImage::kIgnore_AlphaType:
+                case kIgnore_SkAlphaType:
                     // makes no sense
                     return SkBitmap::kNo_Config;
 
-                case SkImage::kOpaque_AlphaType:
+                case kOpaque_SkAlphaType:
                     *isOpaque = true;
                     return SkBitmap::kA8_Config;
 
-                case SkImage::kPremul_AlphaType:
-                case SkImage::kUnpremul_AlphaType:
+                case kPremul_SkAlphaType:
+                case kUnpremul_SkAlphaType:
                     *isOpaque = false;
                     return SkBitmap::kA8_Config;
             }
             break;
 
         case SkImage::kRGB_565_ColorType:
             // we ignore fAlpahType, though some would not make sense
             *isOpaque = true;
             return SkBitmap::kRGB_565_Config;
 
-        case SkImage::kRGBA_8888_ColorType:
-        case SkImage::kBGRA_8888_ColorType:
-            // not supported yet
-            return SkBitmap::kNo_Config;
-
         case SkImage::kPMColor_ColorType:
             switch (info.fAlphaType) {
-                case SkImage::kIgnore_AlphaType:
-                case SkImage::kUnpremul_AlphaType:
+                case kIgnore_SkAlphaType:
+                case kUnpremul_SkAlphaType:
                     // not supported yet
                     return SkBitmap::kNo_Config;
-                case SkImage::kOpaque_AlphaType:
+                case kOpaque_SkAlphaType:
                     *isOpaque = true;
                     return SkBitmap::kARGB_8888_Config;
-                case SkImage::kPremul_AlphaType:
+                case kPremul_SkAlphaType:
                     *isOpaque = false;
                     return SkBitmap::kARGB_8888_Config;
             }
             break;
+        
+        default:
+            // break for unsupported colortypes
+            break;
     }
-    SkDEBUGFAIL("how did we get here");
     return SkBitmap::kNo_Config;
 }
 
 int SkImageBytesPerPixel(SkImage::ColorType ct) {
     static const uint8_t gColorTypeBytesPerPixel[] = {
         1,  // kAlpha_8_ColorType
         2,  // kRGB_565_ColorType
         4,  // kRGBA_8888_ColorType
         4,  // kBGRA_8888_ColorType
         4,  // kPMColor_ColorType
@@ skipping 16 matching lines @@
         case SkBitmap::kARGB_8888_Config:
             info->fColorType = SkImage::kPMColor_ColorType;
             break;
 
         default:
             return false;
     }
 
     info->fWidth = bm.width();
     info->fHeight = bm.height();
-    info->fAlphaType = bm.isOpaque() ? SkImage::kOpaque_AlphaType :
-                                       SkImage::kPremul_AlphaType;
+    info->fAlphaType = bm.isOpaque() ? kOpaque_SkAlphaType :
+                                       kPremul_SkAlphaType;
     return true;
 }
 
 SkImage* SkNewImageFromBitmap(const SkBitmap& bm, bool canSharePixelRef) {
     SkImage::Info info;
     if (!SkBitmapToImageInfo(bm, &info)) {
         return NULL;
     }
 
     SkImage* image = NULL;
@@ skipping 58 matching lines @@
         canvas->save();
     }
     canvas->concat(matrix);
     if (!paint || !needs_layer(*paint)) {
         canvas->clipRect(tmpSrc);
     }
 
     canvas->drawPicture(*picture);
     canvas->restoreToCount(saveCount);
 }