Style Change: NULL->nullptr

src/views/sdl/SkOSWindow_SDL.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkOSWindow_SDL.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkGLCanvas.h"
 #include "SkOSMenu.h"
 #include "SkTime.h"
 
 static void post_SkEvent_event() {
     SDL_Event evt;
     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);
 }
 
 static bool skia_setBitmapFromSurface(SkBitmap* dst, SDL_Surface* src) {
     SkColorType ct;
     SkAlphaType at;
 
     switch (src->format->BytesPerPixel) {
         case 2:
             ct = kRGB_565_SkColorType;
@@ skipping 13 matching lines @@
 SkOSWindow::SkOSWindow(void* screen) {
     fScreen = reinterpret_cast<SDL_Surface*>(screen);
     this->resize(fScreen->w, fScreen->h);
 
     uint32_t rmask = SK_R32_MASK << SK_R32_SHIFT;
     uint32_t gmask = SK_G32_MASK << SK_G32_SHIFT;
     uint32_t bmask = SK_B32_MASK << SK_B32_SHIFT;
     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);
     }
 }
 
 SkOSWindow::~SkOSWindow() {
     delete fGLCanvas;
     if (fSurface) {
         SDL_FreeSurface(fSurface);
     }
@@ skipping 25 matching lines @@
 
         if (skia_setBitmapFromSurface(&bitmap, fSurface)) {
             SkCanvas canvas(bitmap);
             this->draw(&canvas);
         }
 
         if ( SDL_MUSTLOCK(fSurface) ) {
             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);
         }
         SDL_UpdateRect(fScreen, 0, 0, fScreen->w, fScreen->h);
     }
 }
 
 static SkKey find_skkey(SDLKey src) {
     // this array must match the enum order in SkKey.h
     static const SDLKey gKeys[] = {
@@ skipping 77 matching lines @@
 }
 
 void SkOSWindow::onHandleInval(const SkIRect& r) {
     SDL_Event evt;
     evt.type = SDL_VIDEOEXPOSE;
     evt.expose.type = SDL_VIDEOEXPOSE;
     SDL_PushEvent(&evt);
 }
 
 void SkOSWindow::onSetTitle(const char title[]) {
-    SDL_WM_SetCaption(title, NULL);
+    SDL_WM_SetCaption(title, nullptr);
 }
 
 void SkOSWindow::onAddMenu(const SkOSMenu* sk_menu) {}
 
 ///////////////////////////////////////////////////////////////////////////////////////
 
 void SkEvent::SignalNonEmptyQueue() {
     SkDebugf("-------- signal nonempty\n");
     post_SkEvent_event();
 }
 
 static Uint32 timer_callback(Uint32 interval) {
 //    SkDebugf("-------- timercallback %d\n", interval);
     SkEvent::ServiceQueueTimer();
     return 0;
 }
 
 void SkEvent::SignalQueueTimer(SkMSec delay)
 {
-    SDL_SetTimer(0, NULL);
+    SDL_SetTimer(0, nullptr);
     if (delay) {
         SDL_SetTimer(delay, timer_callback);
     }
 }