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/SkDisplayMovie.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/SkDisplayMovie.cpp')
| -rw-r--r-- | src/animator/SkDisplayMovie.cpp | 6 |
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; |