move SkImage::ColorType into SkColorType

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) {
+SkBitmap::Config SkImageInfoToBitmapConfig(const SkImageInfo& info) {
     switch (info.fColorType) {
-        case SkImage::kAlpha_8_ColorType:
+        case kAlpha_8_SkColorType:
             return SkBitmap::kA8_Config;
 
-        case SkImage::kRGB_565_ColorType:
+        case kRGB_565_SkColorType:
             return SkBitmap::kRGB_565_Config;
 
-        case SkImage::kPMColor_ColorType:
+        case kPMColor_SkColorType:
             return SkBitmap::kARGB_8888_Config;
 
         default:
             // break for unsupported colortypes
             break;
     }
     return SkBitmap::kNo_Config;
 }
 
-int SkImageBytesPerPixel(SkImage::ColorType ct) {
+int SkImageBytesPerPixel(SkColorType 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
+        1,  // kAlpha_8_SkColorType
+        2,  // kRGB_565_SkColorType
+        4,  // kRGBA_8888_SkColorType
+        4,  // kBGRA_8888_SkColorType
+        4,  // kPMColor_SkColorType
     };
 
     SkASSERT((size_t)ct < SK_ARRAY_COUNT(gColorTypeBytesPerPixel));
     return gColorTypeBytesPerPixel[ct];
 }
 
-bool SkBitmapToImageInfo(const SkBitmap& bm, SkImage::Info* info) {
+bool SkBitmapToImageInfo(const SkBitmap& bm, SkImageInfo* info) {
     switch (bm.config()) {
         case SkBitmap::kA8_Config:
-            info->fColorType = SkImage::kAlpha_8_ColorType;
+            info->fColorType = kAlpha_8_SkColorType;
             break;
 
         case SkBitmap::kRGB_565_Config:
-            info->fColorType = SkImage::kRGB_565_ColorType;
+            info->fColorType = kRGB_565_SkColorType;
             break;
 
         case SkBitmap::kARGB_8888_Config:
-            info->fColorType = SkImage::kPMColor_ColorType;
+            info->fColorType = kPMColor_SkColorType;
             break;
 
         default:
             return false;
     }
 
     info->fWidth = bm.width();
     info->fHeight = bm.height();
     info->fAlphaType = bm.isOpaque() ? kOpaque_SkAlphaType :
                                        kPremul_SkAlphaType;
     return true;
 }
 
 SkImage* SkNewImageFromBitmap(const SkBitmap& bm, bool canSharePixelRef) {
-    SkImage::Info info;
+    SkImageInfo info;
     if (!SkBitmapToImageInfo(bm, &info)) {
         return NULL;
     }
 
     SkImage* image = NULL;
     if (canSharePixelRef || bm.isImmutable()) {
         image = SkNewImageFromPixelRef(info, bm.pixelRef(), bm.rowBytes());
     } else {
         bm.lockPixels();
         if (bm.getPixels()) {
@@ skipping 53 matching lines @@
         canvas->save();
     }
     canvas->concat(matrix);
     if (!paint || !needs_layer(*paint)) {
         canvas->clipRect(tmpSrc);
     }
 
     canvas->drawPicture(*picture);
     canvas->restoreToCount(saveCount);
 }