Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Unified Diff: src/animator/SkDrawColor.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/animator/SkDrawClip.cpp ('k') | src/animator/SkDrawDash.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « src/animator/SkDrawClip.cpp ('k') | src/animator/SkDrawDash.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698