platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp - Issue 1316233002: Style Change: NULL->nullptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.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 | « platform_tools/android/apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.cpp ('k') | platform_tools/android/apps/visualbench/src/main/jni/main.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp

diff --git a/platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp b/platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp

index e2bc99610ff2beb58e0eafca27b2f6c8257daf5c..487835b31d14c4c6e57e49bf0903e7d147f7c780 100644

--- a/platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp

+++ b/platform_tools/android/apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp

@@ -111,8 +111,8 @@ bool SkOSWindow::attach(SkBackEndTypes attachType,

ANativeWindow_setBuffersGeometry(fNativeWindow, 0, 0, format);

- surface = eglCreateWindowSurface(display, config, fNativeWindow, NULL);

- context = eglCreateContext(display, config, NULL, kAPIs[api].fContextAttribs);

+ surface = eglCreateWindowSurface(display, config, fNativeWindow, nullptr);

+ context = eglCreateContext(display, config, nullptr, kAPIs[api].fContextAttribs);

if (EGL_NO_CONTEXT == context) {

SkDebugf("eglCreateContext failed. EGL Error: 0x%08x\n", eglGetError());

continue;