promote SkImage::AlphaType to SkAlphaType

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 678 matching lines @@
 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 = {
         10,  // width
         10,  // height
         SkImage::kPMColor_ColorType,
-        SkImage::kPremul_AlphaType
+        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 46 matching lines @@
     canvas->flush();
     PixelPtr pixels5 = getSurfacePixelPtr(surface, useGpu);
     REPORTER_ASSERT(reporter, pixels4 == pixels5);
 }
 
 static void TestDeferredCanvasSetSurface(skiatest::Reporter* reporter, GrContextFactory* factory) {
     SkImage::Info imageSpec = {
         10,  // width
         10,  // height
         SkImage::kPMColor_ColorType,
-        SkImage::kPremul_AlphaType
+        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);
     } else {
@@ skipping 62 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)