move SkImage::ColorType into SkColorType

tests/SurfaceTest.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkCanvas.h"
 #include "SkRRect.h"
 #include "SkSurface.h"
 #include "Test.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
 #else
 class GrContextFactory;
 class GrContext;
 #endif
 
 enum SurfaceType {
     kRaster_SurfaceType,
     kGpu_SurfaceType,
     kPicture_SurfaceType
 };
 
 static SkSurface* createSurface(SurfaceType surfaceType, GrContext* context) {
-    static const SkImage::Info imageSpec = {
+    static const SkImageInfo imageSpec = {
         10,  // width
         10,  // height
-        SkImage::kPMColor_ColorType,
+        kPMColor_SkColorType,
         kPremul_SkAlphaType
     };
 
     switch (surfaceType) {
     case kRaster_SurfaceType:
         return SkSurface::NewRaster(imageSpec);
     case kGpu_SurfaceType:
 #if SK_SUPPORT_GPU
         SkASSERT(NULL != context);
         return SkSurface::NewRenderTarget(context, imageSpec);
@@ skipping 207 matching lines @@
         TestSurfaceWritableAfterSnapshotRelease(reporter, kGpu_SurfaceType, context);
         TestSurfaceNoCanvas(reporter, kGpu_SurfaceType, context, SkSurface::kDiscard_ContentChangeMode);
         TestSurfaceNoCanvas(reporter, kGpu_SurfaceType, context, SkSurface::kRetain_ContentChangeMode);
         TestGetTexture(reporter, kGpu_SurfaceType, context);
     }
 #endif
 }
 
 #include "TestClassDef.h"
 DEFINE_GPUTESTCLASS("Surface", SurfaceTestClass, TestSurface)