content/common/gpu/client/gpu_memory_buffer_impl_io_surface.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_io_surface.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:

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

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

index 81cc7183c8641cbdaa2e285ca6f64366534546ab..9506e98fbd8cb118dd135c345f12da4a0b0f28c7 100644

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

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

@@ -145,14 +145,14 @@ uint32 GpuMemoryBufferImplIOSurface::PixelFormat(unsigned internalformat) {

void* GpuMemoryBufferImplIOSurface::Map() {

DCHECK(!mapped_);

- IOSurfaceLock(io_surface_, 0, NULL);

+ IOSurfaceLock(io_surface_, 0, nullptr);

mapped_ = true;

return IOSurfaceGetBaseAddress(io_surface_);

}

void GpuMemoryBufferImplIOSurface::Unmap() {

DCHECK(mapped_);

- IOSurfaceUnlock(io_surface_, 0, NULL);

+ IOSurfaceUnlock(io_surface_, 0, nullptr);

mapped_ = false;

}