Revert of remove (dumb) canvas::NewRaster, and rename surface::NewRasterPMColor to N32Premul

tests/PathTest.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 "SkPaint.h"
 #include "SkParse.h"
@@ skipping 36 matching lines @@
 
 static void make_path_crbug364224_simplified(SkPath* path) {
     path->moveTo(3.747501373f, 2.724499941f);
     path->cubicTo(3.648251295f, 0.5194999576f, 3.575501442f, 0.4999999702f, 3.497501373f, 0.4999999702f);
     path->close();
 }
 
 static void test_path_crbug364224() {
     SkPath path;
     SkPaint paint;
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(84, 88));
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterPMColor(84, 88));
     SkCanvas* canvas = surface->getCanvas();
 
     make_path_crbug364224_simplified(&path);
     canvas->drawPath(path, paint);
 
     make_path_crbug364224(&path);
     canvas->drawPath(path, paint);
 }
 
 /**
@@ skipping 224 matching lines @@
 // This used to assert in the debug build, as the edges did not all line-up.
 static void test_bad_cubic_crbug234190() {
     SkPath path;
     path.moveTo(13.8509f, 3.16858f);
     path.cubicTo(-2.35893e+08f, -4.21044e+08f,
                  -2.38991e+08f, -4.26573e+08f,
                  -2.41016e+08f, -4.30188e+08f);
 
     SkPaint paint;
     paint.setAntiAlias(true);
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(84, 88));
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterPMColor(84, 88));
     surface->getCanvas()->drawPath(path, paint);
 }
 
 static void test_bad_cubic_crbug229478() {
     const SkPoint pts[] = {
         { 4595.91064f,    -11596.9873f },
         { 4597.2168f,    -11595.9414f },
         { 4598.52344f,    -11594.8955f },
         { 4599.83008f,    -11593.8496f },
     };
@@ skipping 98 matching lines @@
 }
 
 // This used to assert in the SK_DEBUG build, as the clip step would fail with
 // too-few interations in our cubic-line intersection code. That code now runs
 // 24 interations (instead of 16).
 static void test_crbug_170666() {
     SkPath path;
     SkPaint paint;
     paint.setAntiAlias(true);
 
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(1000, 1000));
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterPMColor(1000, 1000));
 
     build_path_simple_170666(path);
     surface->getCanvas()->drawPath(path, paint);
 
     build_path_170666(path);
     surface->getCanvas()->drawPath(path, paint);
 }
 
 static void test_addrect(skiatest::Reporter* reporter) {
     SkPath path;
@@ skipping 58 matching lines @@
         path->quadTo(577198, 1972, 577238, 1971.31f);
         path->quadTo(577277, 1970.62f, 577317, 1971.45f);
         path->quadTo(577330, 1971.72f, 577341, 1972.11f);
         path->cubicTo(10.7082f, -116.596f, 262.057f, 45.6468f, 294.694f, 1.96237f);
         path->moveTo(306.718f, -32.912f);
         path->cubicTo(30.531f, 10.0005f, 1502.47f, 13.2804f, 84.3088f, 9.99601f);
     }
 }
 
 static void test_clipped_cubic() {
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(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
     // mode to ensure that we no long assert.
     SkPath path;
     for (int doReducedCase = 0; doReducedCase <= 1; ++doReducedCase) {
         build_big_path(&path, SkToBool(doReducedCase));
 
         SkPaint paint;
         for (int doAA = 0; doAA <= 1; ++doAA) {
@@ skipping 15 matching lines @@
         { SkDoubleToScalar(18.5030727),    SkDoubleToScalar(129.13121)  },
     };
 
     SkPath path;
     path.moveTo(pts[0]);
     path.cubicTo(pts[1], pts[2], pts[3]);
 
     SkPaint paint;
     paint.setAntiAlias(true);
 
-    SkSurface* surface = SkSurface::NewRasterN32Premul(19, 130);
+    SkSurface* surface = SkSurface::NewRasterPMColor(19, 130);
     surface->getCanvas()->drawPath(path, paint);
     surface->unref();
 }
 
 // Inspired by http://code.google.com/p/chromium/issues/detail?id=141651
 //
 static void test_isfinite_after_transform(skiatest::Reporter* reporter) {
     SkPath path;
     path.quadTo(157, 366, 286, 208);
     path.arcTo(37, 442, 315, 163, 957494590897113.0f);
@@ skipping 3176 matching lines @@
     test_addEmptyPath(reporter, SkPath::kExtend_AddPathMode);
     test_addEmptyPath(reporter, SkPath::kAppend_AddPathMode);
     test_conicTo_special_case(reporter);
     test_get_point(reporter);
     test_contains(reporter);
     PathTest_Private::TestPathTo(reporter);
     PathRefTest_Private::TestPathRef(reporter);
     test_dump(reporter);
     test_path_crbugskia2820(reporter);
 }