diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/animator/SkDisplayEvent.cpp | |
| parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'src/animator/SkDisplayEvent.cpp')
| -rw-r--r-- | src/animator/SkDisplayEvent.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/animator/SkDisplayEvent.cpp b/src/animator/SkDisplayEvent.cpp index b5dc8145ae..746780df1c 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; |