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

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 "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkDashPathEffect.h"
 #include "SkSurface.h"
 #include "Test.h"
 
 // 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.installPixels(SkImageInfo::MakeN32Premul(1, 1), pixel, 4);
 
-    SkSurface* surf = SkSurface::NewRasterN32Premul(300, 33300);
+    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 56 matching lines @@
      */
     uint32_t data[] = {
         0x419727af, 0x43011f0c, 0x41972663, 0x43011f27,
         0x419728fc, 0x43011ed4, 0x4194064b, 0x43012197
     };
 
     SkPath path;
     moveToH(&path, &data[0]);
     cubicToH(&path, &data[2]);
 
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(640, 480));
+    SkAutoTUnref<SkCanvas> canvas(SkCanvas::NewRasterN32(640, 480));
 
     SkPaint paint;
     paint.setAntiAlias(true);
-    surface->getCanvas()->drawPath(path, paint);
+    canvas->drawPath(path, paint);
 }
 
 // This used to assert in debug builds (and crash writing bad memory in release)
 // because we overflowed an intermediate value (B coefficient) setting up our
 // stepper for the quadratic. Now we bias that value by 1/2 so we don't overflow
 static void test_crbug_140803() {
     SkBitmap bm;
     bm.allocN32Pixels(2700, 30*1024);
     SkCanvas canvas(bm);
 
     SkPath path;
     path.moveTo(2762, 20);
     path.quadTo(11, 21702, 10, 21706);
     SkPaint paint;
     paint.setAntiAlias(true);
     canvas.drawPath(path, paint);
 }
 
 // Need to exercise drawing an inverse-path whose bounds intersect the clip,
 // but whose edges do not (since its a quad which draws only in the bottom half
 // of its bounds).
 // In the debug build, we used to assert in this case, until it was fixed.
 //
 static void test_inversepathwithclip() {
     SkPath path;
 
-    path.moveTo(0, 20);
-    path.quadTo(10, 10, 20, 20);
+    path.moveTo(0, SkIntToScalar(20));
+    path.quadTo(SkIntToScalar(10), SkIntToScalar(10),
+                SkIntToScalar(20), SkIntToScalar(20));
     path.toggleInverseFillType();
 
     SkPaint paint;
 
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(640, 480));
-    SkCanvas* canvas = surface->getCanvas();
-    canvas->save();
-    canvas->clipRect(SkRect::MakeWH(19, 11));
+    SkAutoTUnref<SkCanvas> canvas(SkCanvas::NewRasterN32(640, 480));
+    canvas.get()->save();
+    canvas.get()->clipRect(SkRect::MakeWH(SkIntToScalar(19), SkIntToScalar(11)));
 
     paint.setAntiAlias(false);
-    canvas->drawPath(path, paint);
+    canvas.get()->drawPath(path, paint);
     paint.setAntiAlias(true);
-    canvas->drawPath(path, paint);
+    canvas.get()->drawPath(path, paint);
 
-    canvas->restore();
+    canvas.get()->restore();
 
     // Now do the test again, with the path flipped, so we only draw in the
     // top half of our bounds, and have the clip intersect our bounds at the
     // bottom.
     path.reset();   // preserves our filltype
-    path.moveTo(0, 10);
-    path.quadTo(10, 20, 20, 10);
-    canvas->clipRect(SkRect::MakeXYWH(0, 19, 19, 11));
+    path.moveTo(0, SkIntToScalar(10));
+    path.quadTo(SkIntToScalar(10), SkIntToScalar(20),
+                SkIntToScalar(20), SkIntToScalar(10));
+    canvas.get()->clipRect(SkRect::MakeXYWH(SkIntToScalar(0), SkIntToScalar(19),
+                                            SkIntToScalar(19), SkIntToScalar(11)));
 
     paint.setAntiAlias(false);
-    canvas->drawPath(path, paint);
+    canvas.get()->drawPath(path, paint);
     paint.setAntiAlias(true);
-    canvas->drawPath(path, paint);
+    canvas.get()->drawPath(path, paint);
 }
 
 static void test_bug533() {
     /*
         http://code.google.com/p/skia/issues/detail?id=533
         This particular test/bug only applies to the float case, where the
         coordinates are very large.
      */
     SkPath path;
     path.moveTo(64, 3);
     path.quadTo(-329936, -100000000, 1153, 330003);
 
     SkPaint paint;
     paint.setAntiAlias(true);
 
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(640, 480));
-    surface->getCanvas()->drawPath(path, paint);
+    SkAutoTUnref<SkCanvas> canvas(SkCanvas::NewRasterN32(640, 480));
+    canvas.get()->drawPath(path, paint);
 }
 
 static void test_crbug_140642() {
     /*
      *  We used to see this construct, and due to rounding as we accumulated
      *  our length, the loop where we apply the phase would run off the end of
      *  the array, since it relied on just -= each interval value, which did not
      *  behave as "expected". Now the code explicitly checks for walking off the
      *  end of that array.
 
@@ skipping 20 matching lines @@
 }
 
 static void test_bigcubic() {
     SkPath path;
     path.moveTo(64, 3);
     path.cubicTo(-329936, -100000000, -329936, 100000000, 1153, 330003);
 
     SkPaint paint;
     paint.setAntiAlias(true);
 
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(640, 480));
-    surface->getCanvas()->drawPath(path, paint);
+    SkAutoTUnref<SkCanvas> canvas(SkCanvas::NewRasterN32(640, 480));
+    canvas.get()->drawPath(path, paint);
 }
 
 // we used to assert if the bounds of the device (clip) was larger than 32K
 // even when the path itself was smaller. We just draw and hope in the debug
 // version to not assert.
 static void test_giantaa() {
     const int W = 400;
     const int H = 400;
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(33000, 10));
+    SkAutoTUnref<SkCanvas> canvas(SkCanvas::NewRasterN32(33000, 10));
 
     SkPaint paint;
     paint.setAntiAlias(true);
     SkPath path;
     path.addOval(SkRect::MakeXYWH(-10, -10, 20 + W, 20 + H));
-    surface->getCanvas()->drawPath(path, paint);
+    canvas.get()->drawPath(path, paint);
 }
 
 // Extremely large path_length/dash_length ratios may cause infinite looping
 // in SkDashPathEffect::filterPath() due to single precision rounding.
 // The test is quite expensive, but it should get much faster after the fix
 // for http://crbug.com/165432 goes in.
 static void test_infinite_dash(skiatest::Reporter* reporter) {
     SkPath path;
     path.moveTo(0, 0);
     path.lineTo(5000000, 0);
@@ skipping 38 matching lines @@
     test_crbug_124652();
     test_crbug_140642();
     test_crbug_140803();
     test_inversepathwithclip();
     // why?
     if (false) test_crbug131181();
     test_infinite_dash(reporter);
     test_crbug_165432(reporter);
     test_big_aa_rect(reporter);
 }