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

Unified Diff: src/animator/SkDisplayEvents.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/SkDisplayEvent.cpp ('k') | src/animator/SkDisplayInput.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkDisplayEvents.cpp
diff --git a/src/animator/SkDisplayEvents.cpp b/src/animator/SkDisplayEvents.cpp
index 3c3791de75ab9ec65721a3cdc14487376e5cf905..d367cf11c30e922d1deb086c36908dcda271c6f7 100644
--- a/src/animator/SkDisplayEvents.cpp
+++ b/src/animator/SkDisplayEvents.cpp
@@ -47,7 +47,7 @@ bool SkEvents::doEvent(SkAnimateMaker& maker, SkDisplayEvent::Kind kind, SkEvent
if (kind != SkDisplayEvent::kOnload)
movie->doEvent(kind, state);
}
- SkDisplayable* displayable = state ? state->fDisplayable : NULL;
+ SkDisplayable* displayable = state ? state->fDisplayable : nullptr;
int keyCode = state ? state->fCode : 0;
int count = fEvents.count();
for (int index = 0; index < count; index++) {
@@ -61,9 +61,9 @@ bool SkEvents::doEvent(SkAnimateMaker& maker, SkDisplayEvent::Kind kind, SkEvent
continue;
evt->fLastCode = (SkKey) keyCode;
}
- if (evt->fTarget != NULL && evt->fTarget != displayable)
+ if (evt->fTarget != nullptr && evt->fTarget != displayable)
continue;
- if (state == NULL || state->fDisable == 0) {
+ if (state == nullptr || state->fDisable == 0) {
if (kind >= SkDisplayEvent::kMouseDown && kind <= SkDisplayEvent::kMouseUp) {
evt->x = state->fX;
evt->y = state->fY;
@@ -96,7 +96,7 @@ void SkEvents::dump(SkAnimateMaker& maker) {
// currently this only removes onLoad events
void SkEvents::removeEvent(SkDisplayEvent::Kind kind, SkEventState* state) {
int keyCode = state ? state->fCode : 0;
- SkDisplayable* displayable = state ? state->fDisplayable : NULL;
+ SkDisplayable* displayable = state ? state->fDisplayable : nullptr;
for (SkDisplayEvent** evtPtr = fEvents.begin(); evtPtr < fEvents.end(); evtPtr++) {
SkDisplayEvent* evt = *evtPtr;
if (evt->kind != kind)
@@ -105,7 +105,7 @@ void SkEvents::removeEvent(SkDisplayEvent::Kind kind, SkEventState* state) {
if ((int) evt->code > keyCode || (int) (evt->fMax != (SkKey) -1 ? evt->fMax : evt->code) < keyCode)
continue;
}
- if (evt->fTarget != NULL && evt->fTarget != displayable)
+ if (evt->fTarget != nullptr && evt->fTarget != displayable)
continue;
int index = fEvents.find(evt);
fEvents.remove(index);
« no previous file with comments | « src/animator/SkDisplayEvent.cpp ('k') | src/animator/SkDisplayInput.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698