promote SkImage::AlphaType to SkAlphaType

tools/skhello.cpp

 /*
  * Copyright 2011 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 "SkCommandLineFlags.h"
 #include "SkData.h"
@@ skipping 12 matching lines @@
     canvas->getClipBounds(&bounds);
 
     canvas->drawColor(SK_ColorWHITE);
     canvas->drawText(text, strlen(text),
                      bounds.centerX(), bounds.centerY(),
                      paint);
 }
 
 static bool do_surface(int w, int h, const char path[], const char text[],
                        const SkPaint& paint) {
-    SkImage::Info info = {
-        w, h, SkImage::kPMColor_ColorType, SkImage::kPremul_AlphaType
-    };
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info));
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterPMColor(w, h));
     doDraw(surface->getCanvas(), paint, text);
 
     SkAutoTUnref<SkImage> image(surface->newImageSnapshot());
     SkAutoDataUnref data(image->encode());
     if (NULL == data.get()) {
         return false;
     }
     SkFILEWStream stream(path);
     return stream.write(data->data(), data->size());
 }
@@ skipping 54 matching lines @@
         }
     }
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif