promote SkImage::AlphaType to SkAlphaType

tests/DrawPathTest.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 "SkCanvas.h"
@@ skipping 18 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // test that we can draw an aa-rect at coordinates > 32K (bigger than fixedpoint)
 static void test_big_aa_rect(skiatest::Reporter* reporter) {
     SkBitmap output;
     SkPMColor pixel[1];
     output.setConfig(SkBitmap::kARGB_8888_Config, 1, 1, 4);
     output.setPixels(pixel);
 
-    SkImage::Info info = {
-        300, 33300, SkImage::kPMColor_ColorType, SkImage::kPremul_AlphaType
-    };
-    SkSurface* surf = SkSurface::NewRaster(info);
+    SkSurface* surf = SkSurface::NewRasterPMColor(300, 33300);
     SkCanvas* canvas = surf->getCanvas();
 
     SkRect r = { 0, 33000, 300, 33300 };
     int x = SkScalarRoundToInt(r.left());
     int y = SkScalarRoundToInt(r.top());
 
     // check that the pixel in question starts as transparent (by the surface)
     if (canvas->readPixels(&output, x, y)) {
         REPORTER_ASSERT(reporter, 0 == pixel[0]);
     } else {
@@ skipping 265 matching lines @@
     test_inversepathwithclip();
     // why?
     if (false) test_crbug131181();
     test_infinite_dash(reporter);
     test_crbug_165432(reporter);
     test_big_aa_rect(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("DrawPath", TestDrawPathClass, TestDrawPath)