Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(411)

Unified Diff: src/views/sdl/SkOSWindow_SDL.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/views/animated/SkWidgetViews.cpp ('k') | src/views/unix/SkOSWindow_Unix.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/views/sdl/SkOSWindow_SDL.cpp
diff --git a/src/views/sdl/SkOSWindow_SDL.cpp b/src/views/sdl/SkOSWindow_SDL.cpp
index 27783d41fc736b6d346e5798a89a5ff82b0b51e3..1954015674885e6328fc49d90291611a4357c75d 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);
}
« no previous file with comments | « src/views/animated/SkWidgetViews.cpp ('k') | src/views/unix/SkOSWindow_Unix.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698