| Index: src/animator/SkPathParts.cpp
|
| diff --git a/src/animator/SkPathParts.cpp b/src/animator/SkPathParts.cpp
|
| index efc7c3355d11242bcb80864e229ad6ea98209bd3..b5407ceeb59db8085de6eed7b264a27edba419ac 100644
|
| --- a/src/animator/SkPathParts.cpp
|
| +++ b/src/animator/SkPathParts.cpp
|
| @@ -13,7 +13,7 @@
|
| #include "SkDrawRectangle.h"
|
| #include "SkDrawPath.h"
|
|
|
| -SkPathPart::SkPathPart() : fPath(NULL) {
|
| +SkPathPart::SkPathPart() : fPath(nullptr) {
|
| }
|
|
|
| void SkPathPart::dirty() {
|
| @@ -25,7 +25,7 @@ SkDisplayable* SkPathPart::getParent() const {
|
| }
|
|
|
| bool SkPathPart::setParent(SkDisplayable* parent) {
|
| - SkASSERT(parent != NULL);
|
| + SkASSERT(parent != nullptr);
|
| if (parent->isPath() == false)
|
| return true;
|
| fPath = (SkDrawPath*) parent;
|
| @@ -305,11 +305,11 @@ const SkMemberInfo SkAddPath::fInfo[] = {
|
|
|
| DEFINE_GET_MEMBER(SkAddPath);
|
|
|
| -SkAddPath::SkAddPath() : matrix(NULL), path(NULL) {
|
| +SkAddPath::SkAddPath() : matrix(nullptr), path(nullptr) {
|
| }
|
|
|
| bool SkAddPath::add() {
|
| - SkASSERT (path != NULL);
|
| + SkASSERT (path != nullptr);
|
| if (matrix)
|
| fPath->fPath.addPath(path->fPath, matrix->getMatrix());
|
| else
|
|
|