commit 96fcdcc219d2a0d3579719b84b28bede76efba64
author halcanary <halcanary@google.com> Thu Aug 27 07:41:13 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 27 07:41:16 2015 -0700
tree 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd
parent 435af2f736c85c3274a0c6760a3523810750d237

Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002

Review URL: https://codereview.chromium.org/1316233002

src/animator/SkDisplayEvents.cpp

diff --git a/src/animator/SkDisplayEvents.cpp b/src/animator/SkDisplayEvents.cpp
index 3c3791d..d367cf1 100644
--- a/src/animator/SkDisplayEvents.cpp
+++ b/src/animator/SkDisplayEvents.cpp
@@ -47,7 +47,7 @@
         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 @@
                 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 @@
 // 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 @@
             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);