move SkImage::ColorType into SkColorType

gm/image.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkSurface.h"
 #include "SkCanvas.h"
@@ skipping 160 matching lines @@
         canvas->drawText(kLabel9, strlen(kLabel9), 160, 10, textPaint);
         canvas->drawText(kLabel10, strlen(kLabel10), 250, 10, textPaint);
         canvas->drawText(kLabel11, strlen(kLabel11), 320, 10, textPaint);
         canvas->drawText(kLabel12, strlen(kLabel12), 410, 10, textPaint);
 
         canvas->translate(80, 20);
 
         // since we draw into this directly, we need to start fresh
         sk_bzero(fBuffer, fBufferSize);
 
-        SkImage::Info info = {
-            W, H, SkImage::kPMColor_ColorType, kPremul_SkAlphaType
+        SkImageInfo info = {
+            W, H, kPMColor_SkColorType, kPremul_SkAlphaType
         };
         SkAutoTUnref<SkSurface> surf0(SkSurface::NewRasterDirect(info, fBuffer, RB));
         SkAutoTUnref<SkSurface> surf1(SkSurface::NewRaster(info));
         SkAutoTUnref<SkSurface> surf2(SkSurface::NewPicture(info.fWidth, info.fHeight));
         SkAutoTUnref<SkSurface> surf3(SkSurface::NewPicture(info.fWidth, info.fHeight));
 #if SK_SUPPORT_GPU
         GrContext* ctx = GM::GetGr(canvas);
 
         SkAutoTUnref<SkSurface> surf4(SkSurface::NewRenderTarget(ctx, info, 0));
 #endif
@@ skipping 18 matching lines @@
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static skiagm::GM* MyFactory(void*) { return new ImageGM; }
 static skiagm::GMRegistry reg(MyFactory);