content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc - Issue 649533003: C++11 declares a type safe null pointer

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: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc

Issue 649533003: C++11 declares a type safe null pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed Presubmit errors Created 6 years, 2 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 | « content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc ('k') | content/common/gpu/client/gpu_video_decode_accelerator_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc

diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc

index 52e0362913300b61ee5545f032cd84e3ff5ba9e5..0d08c552f4ffbe9c4d38322cc305cebf65810077 100644

--- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc

+++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc

@@ -163,10 +163,10 @@ void* GpuMemoryBufferImplSurfaceTexture::Map() {

DCHECK(!mapped_);

DCHECK(native_window_);

ANativeWindow_Buffer buffer;

- int status = ANativeWindow_lock(native_window_, &buffer, NULL);

+ int status = ANativeWindow_lock(native_window_, &buffer, nullptr);

if (status) {

VLOG(1) << "ANativeWindow_lock failed with error code: " << status;

- return NULL;

+ return nullptr;

}

DCHECK_LE(size_.width(), buffer.stride);