| Index: tests/AAClipTest.cpp
|
| diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp
|
| index 1c4f391293f968d9221f85b2fbb4010256a9253b..42fc7e7f9634e23450b7c2396408d2e469dab4d7 100644
|
| --- a/tests/AAClipTest.cpp
|
| +++ b/tests/AAClipTest.cpp
|
| @@ -62,7 +62,7 @@ static void copyToMask(const SkRegion& rgn, SkMask* mask) {
|
| if (rgn.isEmpty()) {
|
| mask->fBounds.setEmpty();
|
| mask->fRowBytes = 0;
|
| - mask->fImage = NULL;
|
| + mask->fImage = nullptr;
|
| return;
|
| }
|
|
|
| @@ -185,7 +185,7 @@ static void test_path_bounds(skiatest::Reporter* reporter) {
|
|
|
| path.addOval(SkRect::MakeWH(sheight, sheight));
|
| REPORTER_ASSERT(reporter, sheight == path.getBounds().height());
|
| - clip.setPath(path, NULL, true);
|
| + clip.setPath(path, nullptr, true);
|
| REPORTER_ASSERT(reporter, height == clip.getBounds().height());
|
|
|
| // this is the trimmed height of this cubic (with aa). The critical thing
|
| @@ -199,7 +199,7 @@ static void test_path_bounds(skiatest::Reporter* reporter) {
|
| imoveTo(path, 0, 20);
|
| icubicTo(path, 40, 40, 40, 0, 0, 20);
|
| REPORTER_ASSERT(reporter, sheight == path.getBounds().height());
|
| - clip.setPath(path, NULL, true);
|
| + clip.setPath(path, nullptr, true);
|
| REPORTER_ASSERT(reporter, teardrop_height == clip.getBounds().height());
|
| }
|
|
|
| @@ -228,9 +228,9 @@ static void test_empty(skiatest::Reporter* reporter) {
|
| REPORTER_ASSERT(reporter, clip1 == clip0);
|
|
|
| SkMask mask;
|
| - mask.fImage = NULL;
|
| + mask.fImage = nullptr;
|
| clip0.copyToMask(&mask);
|
| - REPORTER_ASSERT(reporter, NULL == mask.fImage);
|
| + REPORTER_ASSERT(reporter, nullptr == mask.fImage);
|
| REPORTER_ASSERT(reporter, mask.fBounds.isEmpty());
|
| }
|
|
|
| @@ -308,7 +308,7 @@ static void test_path_with_hole(skiatest::Reporter* reporter) {
|
|
|
| for (int i = 0; i < 2; ++i) {
|
| SkAAClip clip;
|
| - clip.setPath(path, NULL, 1 == i);
|
| + clip.setPath(path, nullptr, 1 == i);
|
|
|
| SkMask mask;
|
| clip.copyToMask(&mask);
|
|
|