| Index: src/animator/SkDrawColor.cpp
|
| diff --git a/src/animator/SkDrawColor.cpp b/src/animator/SkDrawColor.cpp
|
| index d86a2e93e7261875418395b9811fe06840a6ed64..c2d0dae8fe6f6a309eec7e7452ece7cd8704ad91 100644
|
| --- a/src/animator/SkDrawColor.cpp
|
| +++ b/src/animator/SkDrawColor.cpp
|
| @@ -126,7 +126,7 @@ SkDrawColor::SkDrawColor() : fDirty(false) {
|
| }
|
|
|
| bool SkDrawColor::add() {
|
| - if (fPaint->color != NULL)
|
| + if (fPaint->color != nullptr)
|
| return true; // error (probably color in paint as attribute as well)
|
| fPaint->color = this;
|
| fPaint->fOwnsColor = true;
|
| @@ -211,7 +211,7 @@ void SkDrawColor::onEndElement(SkAnimateMaker&) {
|
| }
|
|
|
| bool SkDrawColor::setParent(SkDisplayable* parent) {
|
| - SkASSERT(parent != NULL);
|
| + SkASSERT(parent != nullptr);
|
| if (parent->getType() == SkType_DrawLinearGradient || parent->getType() == SkType_DrawRadialGradient)
|
| return false;
|
| if (parent->isPaint() == false)
|
|
|