| Index: tests/RecordDrawTest.cpp
|
| diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
|
| index 84ceb20f5481b718cb83920fd55b3acd3c581904..d8ca48d7969c0904275bad925fc62fe1a9d6a07d 100644
|
| --- a/tests/RecordDrawTest.cpp
|
| +++ b/tests/RecordDrawTest.cpp
|
| @@ -67,7 +67,7 @@ DEF_TEST(RecordDraw_Abort, r) {
|
| SkRecorder canvas(&rerecord, W, H);
|
|
|
| JustOneDraw callback;
|
| - SkRecordDraw(record, &canvas, NULL, NULL, 0, NULL/*bbh*/, &callback);
|
| + SkRecordDraw(record, &canvas, nullptr, nullptr, 0, nullptr/*bbh*/, &callback);
|
|
|
| REPORTER_ASSERT(r, 1 == count_instances_of_type<SkRecords::DrawRect>(rerecord));
|
| REPORTER_ASSERT(r, 0 == count_instances_of_type<SkRecords::ClipRect>(rerecord));
|
| @@ -81,7 +81,7 @@ DEF_TEST(RecordDraw_Unbalanced, r) {
|
|
|
| SkRecord rerecord;
|
| SkRecorder canvas(&rerecord, W, H);
|
| - SkRecordDraw(record, &canvas, NULL, NULL, 0, NULL/*bbh*/, NULL/*callback*/);
|
| + SkRecordDraw(record, &canvas, nullptr, nullptr, 0, nullptr/*bbh*/, nullptr/*callback*/);
|
|
|
| int save_count = count_instances_of_type<SkRecords::Save>(rerecord);
|
| int restore_count = count_instances_of_type<SkRecords::Save>(rerecord);
|
| @@ -103,7 +103,7 @@ DEF_TEST(RecordDraw_SetMatrixClobber, r) {
|
| translate.setTranslate(20, 20);
|
| translateCanvas.setMatrix(translate);
|
|
|
| - SkRecordDraw(scaleRecord, &translateCanvas, NULL, NULL, 0, NULL/*bbh*/, NULL/*callback*/);
|
| + SkRecordDraw(scaleRecord, &translateCanvas, nullptr, nullptr, 0, nullptr/*bbh*/, nullptr/*callback*/);
|
| REPORTER_ASSERT(r, 4 == translateRecord.count());
|
| assert_type<SkRecords::SetMatrix>(r, translateRecord, 0);
|
| assert_type<SkRecords::Save> (r, translateRecord, 1);
|
| @@ -215,7 +215,7 @@ DEF_TEST(RecordDraw_PartialStartStop, r) {
|
|
|
| SkRecord rerecord;
|
| SkRecorder canvas(&rerecord, kWidth, kHeight);
|
| - SkRecordPartialDraw(record, &canvas, NULL, 0, 1, 2, SkMatrix::I()); // replay just drawRect of r2
|
| + SkRecordPartialDraw(record, &canvas, nullptr, 0, 1, 2, SkMatrix::I()); // replay just drawRect of r2
|
|
|
| REPORTER_ASSERT(r, 1 == count_instances_of_type<SkRecords::DrawRect>(rerecord));
|
| int index = find_first_instances_of_type<SkRecords::DrawRect>(rerecord);
|
| @@ -238,7 +238,7 @@ DEF_TEST(RecordDraw_SaveLayerAffectsClipBounds, r) {
|
| paint.setImageFilter(SkDropShadowImageFilter::Create(20, 0, 0, 0, SK_ColorBLACK,
|
| SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode))->unref();
|
|
|
| - recorder.saveLayer(NULL, &paint);
|
| + recorder.saveLayer(nullptr, &paint);
|
| recorder.clipRect(SkRect::MakeWH(20, 40));
|
| recorder.drawRect(SkRect::MakeWH(20, 40), SkPaint());
|
| recorder.restore();
|
| @@ -317,7 +317,7 @@ DEF_TEST(RecordDraw_drawImage, r){
|
| SkRecord record;
|
| SkRecorder recorder(&record, 10, 10);
|
| recorder.drawImage(image, 0, 0);
|
| - SkRecordDraw(record, &canvas, NULL, NULL, 0, NULL, 0);
|
| + SkRecordDraw(record, &canvas, nullptr, nullptr, 0, nullptr, 0);
|
| }
|
| REPORTER_ASSERT(r, canvas.fDrawImageCalled);
|
| canvas.resetTestValues();
|
| @@ -326,7 +326,7 @@ DEF_TEST(RecordDraw_drawImage, r){
|
| SkRecord record;
|
| SkRecorder recorder(&record, 10, 10);
|
| recorder.drawImageRect(image, SkRect::MakeWH(10, 10), nullptr);
|
| - SkRecordDraw(record, &canvas, NULL, NULL, 0, NULL, 0);
|
| + SkRecordDraw(record, &canvas, nullptr, nullptr, 0, nullptr, 0);
|
| }
|
| REPORTER_ASSERT(r, canvas.fDrawImageRectCalled);
|
|
|
|
|