move SkImage::ColorType into SkColorType

tests/DeferredCanvasTest.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 "Test.h"
 #include "SkBitmap.h"
 #include "SkBitmapDevice.h"
@@ skipping 39 matching lines @@
     MockSurface(int width, int height) : SkSurface_Base(width, height) {
         clearCounts();
         fBitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
         fBitmap.allocPixels();
     }
 
     virtual SkCanvas* onNewCanvas() SK_OVERRIDE {
         return SkNEW_ARGS(SkCanvas, (fBitmap));
     }
 
-    virtual SkSurface* onNewSurface(const SkImage::Info&) SK_OVERRIDE {
+    virtual SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE {
         return NULL;
     }
 
     virtual SkImage* onNewImageSnapshot() SK_OVERRIDE {
         return SkNewImageFromBitmap(fBitmap, true);
     }
 
     virtual void onCopyOnWrite(ContentChangeMode mode) SK_OVERRIDE {
         if (mode == SkSurface::kDiscard_ContentChangeMode) {
             fDiscardCount++;
@@ skipping 614 matching lines @@
 typedef void* PixelPtr;
 // Returns an opaque pointer which, either points to a GrTexture or RAM pixel
 // buffer. Used to test pointer equality do determine whether a surface points
 // to the same pixel data storage as before.
 static PixelPtr getSurfacePixelPtr(SkSurface* surface, bool useGpu) {
     return useGpu ? surface->getCanvas()->getDevice()->accessBitmap(false).getTexture() :
         surface->getCanvas()->getDevice()->accessBitmap(false).getPixels();
 }
 
 static void TestDeferredCanvasSurface(skiatest::Reporter* reporter, GrContextFactory* factory) {
-    SkImage::Info imageSpec = {
+    SkImageInfo imageSpec = {
         10,  // width
         10,  // height
-        SkImage::kPMColor_ColorType,
+        kPMColor_SkColorType,
         kPremul_SkAlphaType
     };
     SkSurface* surface;
     bool useGpu = NULL != factory;
 #if SK_SUPPORT_GPU
     if (useGpu) {
         GrContext* context = factory->get(GrContextFactory::kNative_GLContextType);
         surface = SkSurface::NewRenderTarget(context, imageSpec);
     } else {
         surface = SkSurface::NewRaster(imageSpec);
@@ skipping 43 matching lines @@
     canvas->clear(SK_ColorWHITE);
     canvas->flush();
     PixelPtr pixels4 = getSurfacePixelPtr(surface, useGpu);
     canvas->drawPaint(paint);
     canvas->flush();
     PixelPtr pixels5 = getSurfacePixelPtr(surface, useGpu);
     REPORTER_ASSERT(reporter, pixels4 == pixels5);
 }
 
 static void TestDeferredCanvasSetSurface(skiatest::Reporter* reporter, GrContextFactory* factory) {
-    SkImage::Info imageSpec = {
+    SkImageInfo imageSpec = {
         10,  // width
         10,  // height
-        SkImage::kPMColor_ColorType,
+        kPMColor_SkColorType,
         kPremul_SkAlphaType
     };
     SkSurface* surface;
     SkSurface* alternateSurface;
     bool useGpu = NULL != factory;
 #if SK_SUPPORT_GPU
     if (useGpu) {
         GrContext* context = factory->get(GrContextFactory::kNative_GLContextType);
         surface = SkSurface::NewRenderTarget(context, imageSpec);
         alternateSurface = SkSurface::NewRenderTarget(context, imageSpec);
@@ skipping 63 matching lines @@
     TestDeferredCanvasSurface(reporter, NULL);
     TestDeferredCanvasSetSurface(reporter, NULL);
     if (NULL != factory) {
         TestDeferredCanvasSurface(reporter, factory);
         TestDeferredCanvasSetSurface(reporter, factory);
     }
 }
 
 #include "TestClassDef.h"
 DEFINE_GPUTESTCLASS("DeferredCanvas", TestDeferredCanvasClass, TestDeferredCanvas)