promote SkImage::AlphaType to SkAlphaType
BUG=
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/24130009
git-svn-id: http://skia.googlecode.com/svn/trunk@11421 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 080ce28..ff51edd 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -25,13 +25,6 @@
#define SUPPRESS_VISIBILITY_WARNING __attribute__((visibility("hidden")))
#endif
-static SkSurface* new_surface(int w, int h) {
- SkImage::Info info = {
- w, h, SkImage::kPMColor_ColorType, SkImage::kPremul_AlphaType
- };
- return SkSurface::NewRaster(info);
-}
-
static void test_path_close_issue1474(skiatest::Reporter* reporter) {
// This test checks that r{Line,Quad,Conic,Cubic}To following a close()
// are relative to the point we close to, not relative to the point we close from.
@@ -141,7 +134,7 @@
SkPaint paint;
paint.setAntiAlias(true);
- SkAutoTUnref<SkSurface> surface(new_surface(84, 88));
+ SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterPMColor(84, 88));
surface->getCanvas()->drawPath(path, paint);
}
@@ -260,7 +253,7 @@
SkPaint paint;
paint.setAntiAlias(true);
- SkAutoTUnref<SkSurface> surface(new_surface(1000, 1000));
+ SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterPMColor(1000, 1000));
build_path_simple_170666(path);
surface->getCanvas()->drawPath(path, paint);
@@ -312,7 +305,7 @@
}
static void test_clipped_cubic() {
- SkAutoTUnref<SkSurface> surface(new_surface(640, 480));
+ SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterPMColor(640, 480));
// This path used to assert, because our cubic-chopping code incorrectly
// moved control points after the chop. This test should be run in SK_DEBUG
@@ -348,7 +341,7 @@
SkPaint paint;
paint.setAntiAlias(true);
- SkSurface* surface = new_surface(19, 130);
+ SkSurface* surface = SkSurface::NewRasterPMColor(19, 130);
surface->getCanvas()->drawPath(path, paint);
surface->unref();
}