promote SkImage::AlphaType to SkAlphaType

gm/fatpathfill.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
 #include "SkSurface.h"
 
 #define ZOOM    32
 #define SMALL_W 9
 #define SMALL_H 3
 #define REPEAT_LOOP 5
 
 static SkSurface* new_surface(int width, int height) {
-    SkImage::Info info = {
-        width,
-        height,
-        SkImage::kPMColor_ColorType,
-        SkImage::kPremul_AlphaType
-    };
-    return SkSurface::NewRaster(info);
+    return SkSurface::NewRasterPMColor(width, height);
 }
 
 static void draw_pixel_centers(SkCanvas* canvas) {
     SkPaint paint;
     paint.setColor(0xFF0088FF);
     paint.setAntiAlias(true);
 
     for (int y = 0; y < SMALL_H; ++y) {
         for (int x = 0; x < SMALL_W; ++x) {
             canvas->drawCircle(x + 0.5f, y + 0.5f, 1.5f / ZOOM, paint);
@@ skipping 54 matching lines @@
         }
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new FatPathFillGM;)