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

Unified Diff: src/animator/SkDisplayEvent.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/SkDisplayApply.cpp ('k') | src/animator/SkDisplayEvents.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « src/animator/SkDisplayApply.cpp ('k') | src/animator/SkDisplayEvents.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698