promote SkImage::AlphaType to SkAlphaType

include/core/SkSurface.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkSurface_DEFINED
 #define SkSurface_DEFINED
 
@@ skipping 35 matching lines @@
      */
     static SkSurface* NewRaster(const SkImage::Info&);
 
     /**
      *  Helper version of NewRaster. It creates a SkImage::Info with the
      *  specified width and height, and populates the rest of info to match
      *  pixels in SkPMColor format.
      */
     static SkSurface* NewRasterPMColor(int width, int height) {
         SkImage::Info info = {
-            width, height, SkImage::kPMColor_ColorType, SkImage::kPremul_AlphaType
+            width, height, SkImage::kPMColor_ColorType, kPremul_SkAlphaType
         };
         return NewRaster(info);
     }
 
     /**
      *  Return a new surface whose contents will be recorded into a picture.
      *  When this surface is drawn into another canvas, its contents will be
      *  "replayed" into that canvas.
      */
     static SkSurface* NewPicture(int width, int height);
@@ skipping 94 matching lines @@
 
 private:
     const int   fWidth;
     const int   fHeight;
     uint32_t    fGenerationID;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif