Index: src/animator/SkDisplayEvent.cpp |
diff --git a/src/animator/SkDisplayEvent.cpp b/src/animator/SkDisplayEvent.cpp |
index b5dc8145aed18ed846bf1e4ad071f696f956cdc6..746780df1c305d0d28e6bb57eb23fdaf801383ae 100644 |
--- a/src/animator/SkDisplayEvent.cpp |
+++ b/src/animator/SkDisplayEvent.cpp |
@@ -45,7 +45,7 @@ const SkMemberInfo SkDisplayEvent::fInfo[] = { |
DEFINE_GET_MEMBER(SkDisplayEvent); |
SkDisplayEvent::SkDisplayEvent() : code((SkKey) -1), disable(false), |
- kind(kUser), x(0), y(0), fLastCode((SkKey) -1), fMax((SkKey) -1), fTarget(NULL) { |
+ kind(kUser), x(0), y(0), fLastCode((SkKey) -1), fMax((SkKey) -1), fTarget(nullptr) { |
} |
SkDisplayEvent::~SkDisplayEvent() { |
@@ -71,7 +71,7 @@ SkDisplayable* SkDisplayEvent::contains(const SkString& match) { |
if (child->contains(match)) |
return child; |
} |
- return NULL; |
+ return nullptr; |
} |
void SkDisplayEvent::deleteMembers() { |
@@ -100,7 +100,7 @@ void SkDisplayEvent::dumpEvent(SkAnimateMaker* maker) { |
else |
SkDebugf("key=\"%c\" ", code); |
} |
- if (fTarget != NULL) { |
+ if (fTarget != nullptr) { |
SkDebugf("target=\"%s\" ", fTarget->id); |
} |
if (kind >= SkDisplayEvent::kMouseDown && kind <= SkDisplayEvent::kMouseUp) { |
@@ -188,7 +188,7 @@ void SkDisplayEvent::populateInput(SkAnimateMaker& maker, const SkEvent& fEvent) |
SkMetaData::Type type; |
int number; |
const char* name; |
- while ((name = iter.next(&type, &number)) != NULL) { |
+ while ((name = iter.next(&type, &number)) != nullptr) { |
if (name[0] == '\0') |
continue; |
SkDisplayable* displayable; |