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

Unified Diff: src/animator/SkAnimateField.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/SkAnimateBase.cpp ('k') | src/animator/SkAnimateMaker.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkAnimateField.cpp
diff --git a/src/animator/SkAnimateField.cpp b/src/animator/SkAnimateField.cpp
index c6676e5be7fc392129e6f636f54bac7dd93d14e1..00113823eec362cbd48ab78d021676c881828046 100644
--- a/src/animator/SkAnimateField.cpp
+++ b/src/animator/SkAnimateField.cpp
@@ -63,7 +63,7 @@ void SkAnimate::dump(SkAnimateMaker* maker) {
#endif
bool SkAnimate::resolveCommon(SkAnimateMaker& maker) {
- if (fTarget == NULL) // if NULL, recall onEndElement after apply closes and sets target to scope
+ if (fTarget == nullptr) // if nullptr, recall onEndElement after apply closes and sets target to scope
return false;
INHERITED::onEndElement(maker);
return maker.hasError() == false;
@@ -71,16 +71,16 @@ bool SkAnimate::resolveCommon(SkAnimateMaker& maker) {
void SkAnimate::onEndElement(SkAnimateMaker& maker) {
bool resolved = resolveCommon(maker);
- if (resolved && fFieldInfo == NULL) {
+ if (resolved && fFieldInfo == nullptr) {
maker.setErrorNoun(field);
maker.setErrorCode(SkDisplayXMLParserError::kFieldNotInTarget);
}
- if (resolved == false || fFieldInfo == NULL)
+ if (resolved == false || fFieldInfo == nullptr)
return;
SkDisplayTypes outType = fFieldInfo->getType();
if (fHasValues) {
SkASSERT(to.size() > 0);
- fFieldInfo->setValue(maker, &fValues, 0, 0, NULL, outType, to);
+ fFieldInfo->setValue(maker, &fValues, 0, 0, nullptr, outType, to);
SkASSERT(0);
// !!! this needs to set fComponents
return;
« no previous file with comments | « src/animator/SkAnimateBase.cpp ('k') | src/animator/SkAnimateMaker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698