switch surface to sk_sp

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 "SkStrokeRec.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);
+    auto surf = SkSurface::MakeRasterN32Premul(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 {
         REPORTER_ASSERT_MESSAGE(reporter, false, "readPixels failed");
     }
 
     SkPaint paint;
     paint.setAntiAlias(true);
     paint.setColor(SK_ColorWHITE);
 
     canvas->drawRect(r, paint);
 
     // Now check that it is BLACK
     if (canvas->readPixels(&output, x, y)) {
         // don't know what swizzling PMColor did, but white should always
         // appear the same.
         REPORTER_ASSERT(reporter, 0xFFFFFFFF == pixel[0]);
     } else {
         REPORTER_ASSERT_MESSAGE(reporter, false, "readPixels failed");
     }
-    surf->unref();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static void moveToH(SkPath* path, const uint32_t raw[]) {
     const float* fptr = (const float*)raw;
     path->moveTo(fptr[0], fptr[1]);
 }
 
 static void cubicToH(SkPath* path, const uint32_t raw[]) {
@@ skipping 28 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));
+    auto surface(SkSurface::MakeRasterN32Premul(640, 480));
 
     SkPaint paint;
     paint.setAntiAlias(true);
     surface->getCanvas()->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() {
@@ skipping 16 matching lines @@
 //
 static void test_inversepathwithclip() {
     SkPath path;
 
     path.moveTo(0, 20);
     path.quadTo(10, 10, 20, 20);
     path.toggleInverseFillType();
 
     SkPaint paint;
 
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(640, 480));
+    auto surface(SkSurface::MakeRasterN32Premul(640, 480));
     SkCanvas* canvas = surface->getCanvas();
     canvas->save();
     canvas->clipRect(SkRect::MakeWH(19, 11));
 
     paint.setAntiAlias(false);
     canvas->drawPath(path, paint);
     paint.setAntiAlias(true);
     canvas->drawPath(path, paint);
 
     canvas->restore();
@@ skipping 18 matching lines @@
         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));
+    auto surface(SkSurface::MakeRasterN32Premul(640, 480));
     surface->getCanvas()->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 21 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));
+    auto surface(SkSurface::MakeRasterN32Premul(640, 480));
     surface->getCanvas()->drawPath(path, paint);
 }
 
 // asserts if halfway case is not handled
 static void test_halfway() {
     SkPaint paint;
     SkPath path;
     path.moveTo(16365.5f, 1394);
     path.lineTo(16365.5f, 1387.5f);
     path.quadTo(16365.5f, 1385.43f, 16367, 1383.96f);
     path.quadTo(16368.4f, 1382.5f, 16370.5f, 1382.5f);
     path.lineTo(16465.5f, 1382.5f);
     path.quadTo(16467.6f, 1382.5f, 16469, 1383.96f);
     path.quadTo(16470.5f, 1385.43f, 16470.5f, 1387.5f);
     path.lineTo(16470.5f, 1394);
     path.quadTo(16470.5f, 1396.07f, 16469, 1397.54f);
     path.quadTo(16467.6f, 1399, 16465.5f, 1399);
     path.lineTo(16370.5f, 1399);
     path.quadTo(16368.4f, 1399, 16367, 1397.54f);
     path.quadTo(16365.5f, 1396.07f, 16365.5f, 1394);
     path.close();
     SkPath p2;
     SkMatrix m;
     m.reset();
     m.postTranslate(0.001f, 0.001f);
     path.transform(m, &p2);
 
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(640, 480));
+    auto surface(SkSurface::MakeRasterN32Premul(640, 480));
     SkCanvas* canvas = surface->getCanvas();
     canvas->translate(-16366, -1383);
     canvas->drawPath(p2, paint);
 
     m.reset();
     m.postTranslate(-0.001f, -0.001f);
     path.transform(m, &p2);
     canvas->drawPath(p2, paint);
 
     m.reset();
     path.transform(m, &p2);
     canvas->drawPath(p2, 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));
+    auto surface(SkSurface::MakeRasterN32Premul(33000, 10));
 
     SkPaint paint;
     paint.setAntiAlias(true);
     SkPath path;
     path.addOval(SkRect::MakeXYWH(-10, -10, 20 + W, 20 + H));
     surface->getCanvas()->drawPath(path, paint);
 }
 
 // Extremely large path_length/dash_length ratios may cause infinite looping
 // in SkDashPathEffect::filterPath() due to single precision rounding.
@@ skipping 33 matching lines @@
 
     SkPath filteredPath;
     SkStrokeRec rec(paint);
     REPORTER_ASSERT(reporter, !dash->filterPath(&filteredPath, path, &rec, nullptr));
     REPORTER_ASSERT(reporter, filteredPath.isEmpty());
 }
 
 // http://crbug.com/472147
 // This is a simplified version from the bug. RRect radii not properly scaled.
 static void test_crbug_472147_simple(skiatest::Reporter* reporter) {
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(1000, 1000));
+    auto surface(SkSurface::MakeRasterN32Premul(1000, 1000));
     SkCanvas* canvas = surface->getCanvas();
     SkPaint p;
     SkRect r = SkRect::MakeLTRB(-246.0f, 33.0f, 848.0f, 33554464.0f);
     SkVector radii[4] = {
         { 13.0f, 8.0f }, { 170.0f, 2.0 }, { 256.0f, 33554430.0f }, { 120.0f, 5.0f }
     };
     SkRRect rr;
     rr.setRectRadii(r, radii);
     canvas->drawRRect(rr, p);
 }
 
 // http://crbug.com/472147
 // RRect radii not properly scaled.
 static void test_crbug_472147_actual(skiatest::Reporter* reporter) {
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(1000, 1000));
+    auto surface(SkSurface::MakeRasterN32Premul(1000, 1000));
     SkCanvas* canvas = surface->getCanvas();
     SkPaint p;
     SkRect r = SkRect::MakeLTRB(-246.0f, 33.0f, 848.0f, 33554464.0f);
     SkVector radii[4] = {
         { 13.0f, 8.0f }, { 170.0f, 2.0 }, { 256.0f, 33554430.0f }, { 120.0f, 5.0f }
     };
     SkRRect rr;
     rr.setRectRadii(r, radii);
     canvas->clipRRect(rr, SkRegion::kIntersect_Op, false);
 
@@ skipping 11 matching lines @@
     test_inversepathwithclip();
     // why?
     if (false) test_crbug131181();
     test_infinite_dash(reporter);
     test_crbug_165432(reporter);
     test_crbug_472147_simple(reporter);
     test_crbug_472147_actual(reporter);
     test_big_aa_rect(reporter);
     test_halfway();
 }