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/views/sdl/SkOSWindow_SDL.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/views/sdl/SkOSWindow_SDL.cpp')
| -rw-r--r-- | src/views/sdl/SkOSWindow_SDL.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/views/sdl/SkOSWindow_SDL.cpp b/src/views/sdl/SkOSWindow_SDL.cpp index 27783d41fc..1954015674 100644 --- a/src/views/sdl/SkOSWindow_SDL.cpp +++ b/src/views/sdl/SkOSWindow_SDL.cpp @@ -17,8 +17,8 @@ static void post_SkEvent_event() { evt.type = SDL_USEREVENT; evt.user.type = SDL_USEREVENT; evt.user.code = 0; - evt.user.data1 = NULL; - evt.user.data2 = NULL; + evt.user.data1 = nullptr; + evt.user.data2 = nullptr; SDL_PushEvent(&evt); } @@ -52,11 +52,11 @@ SkOSWindow::SkOSWindow(void* screen) { uint32_t amask = SK_A32_MASK << SK_A32_SHIFT; if (fScreen->flags & SDL_OPENGL) { - fSurface = NULL; + fSurface = nullptr; fGLCanvas = new SkGLCanvas; fGLCanvas->setViewport(fScreen->w, fScreen->h); } else { - fGLCanvas = NULL; + fGLCanvas = nullptr; fSurface = SDL_CreateRGBSurface(SDL_SWSURFACE, fScreen->w, fScreen->h, 32, rmask, gmask, bmask, amask); } @@ -102,7 +102,7 @@ void SkOSWindow::doDraw() { SDL_UnlockSurface(fSurface); } - int result = SDL_BlitSurface(fSurface, NULL, fScreen, NULL); + int result = SDL_BlitSurface(fSurface, nullptr, fScreen, nullptr); if (result) { SkDebugf("------- SDL_BlitSurface returned %d\n", result); } @@ -200,7 +200,7 @@ void SkOSWindow::onHandleInval(const SkIRect& r) { } void SkOSWindow::onSetTitle(const char title[]) { - SDL_WM_SetCaption(title, NULL); + SDL_WM_SetCaption(title, nullptr); } void SkOSWindow::onAddMenu(const SkOSMenu* sk_menu) {} @@ -220,7 +220,7 @@ static Uint32 timer_callback(Uint32 interval) { void SkEvent::SignalQueueTimer(SkMSec delay) { - SDL_SetTimer(0, NULL); + SDL_SetTimer(0, nullptr); if (delay) { SDL_SetTimer(delay, timer_callback); } |