| Index: src/gpu/GrRecordReplaceDraw.cpp
|
| diff --git a/src/gpu/GrRecordReplaceDraw.cpp b/src/gpu/GrRecordReplaceDraw.cpp
|
| index 5f0adb1601f9f7bde8d0a9f8530d06edf7d1081d..bca92558567cb8438ae6e0406bfe084cdd815840 100644
|
| --- a/src/gpu/GrRecordReplaceDraw.cpp
|
| +++ b/src/gpu/GrRecordReplaceDraw.cpp
|
| @@ -64,7 +64,7 @@ public:
|
| const SkMatrix& initialMatrix,
|
| SkPicture::AbortCallback* callback,
|
| const int* opIndices, int numIndices)
|
| - : INHERITED(canvas, drawablePicts, NULL, drawableCount)
|
| + : INHERITED(canvas, drawablePicts, nullptr, drawableCount)
|
| , fCanvas(canvas)
|
| , fLayerCache(layerCache)
|
| , fTopLevelPicture(topLevelPicture)
|
| @@ -79,7 +79,7 @@ public:
|
| int draw() {
|
| const SkBBoxHierarchy* bbh = fPicture->bbh();
|
| const SkRecord* record = fPicture->record();
|
| - if (NULL == record) {
|
| + if (nullptr == record) {
|
| return 0;
|
| }
|
|
|
| @@ -218,9 +218,9 @@ int GrRecordReplaceDraw(const SkPicture* picture,
|
|
|
| if (const SkBigPicture* bp = picture->asSkBigPicture()) {
|
| // TODO: drawablePicts?
|
| - ReplaceDraw draw(canvas, layerCache, NULL, 0,
|
| + ReplaceDraw draw(canvas, layerCache, nullptr, 0,
|
| bp, bp,
|
| - initialMatrix, callback, NULL, 0);
|
| + initialMatrix, callback, nullptr, 0);
|
| return draw.draw();
|
| } else {
|
| // TODO: can we assume / assert this doesn't happen?
|
|
|