aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/animator/SkDisplayMovie.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/animator/SkDisplayMovie.cpp')
-rw-r--r--src/animator/SkDisplayMovie.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/animator/SkDisplayMovie.cpp b/src/animator/SkDisplayMovie.cpp
index ea832dcb4c..797d853be6 100644
--- a/src/animator/SkDisplayMovie.cpp
+++ b/src/animator/SkDisplayMovie.cpp
@@ -34,7 +34,7 @@ void SkDisplayMovie::buildMovie() {
return;
SkAnimateMaker* movieMaker = fMovie.fMaker;
SkAnimateMaker* parentMaker = movieMaker->fParentMaker;
- if (src.size() == 0 || parentMaker == NULL)
+ if (src.size() == 0 || parentMaker == nullptr)
return;
movieMaker->fPrefix.set(parentMaker->fPrefix);
fDecodedSuccessfully = fMovie.fMaker->decodeURI(src.c_str());
@@ -105,8 +105,8 @@ bool SkDisplayMovie::enable(SkAnimateMaker&) {
if (fDecodedSuccessfully == false)
return false;
SkAnimateMaker* movieMaker = fMovie.fMaker;
- movieMaker->fEvents.doEvent(*movieMaker, SkDisplayEvent::kOnload, NULL);
- movieMaker->fEvents.removeEvent(SkDisplayEvent::kOnload, NULL);
+ movieMaker->fEvents.doEvent(*movieMaker, SkDisplayEvent::kOnload, nullptr);
+ movieMaker->fEvents.removeEvent(SkDisplayEvent::kOnload, nullptr);
fLoaded = true;
movieMaker->fLoaded = true;
return false;