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

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

index e773ca90782a6dc684bec38c7afb455e1cfe925c..8e420c9ba89edbd42881bfc0748fdcf7936cd586 100644

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

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

@@ -82,7 +82,7 @@ void GLHelperReadbackSupport::GetAdditionalFormat(GLenum format,

gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);

gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);

gl_->TexImage2D(

- GL_TEXTURE_2D, 0, format, kTestSize, kTestSize, 0, format, type, NULL);

+ GL_TEXTURE_2D, 0, format, kTestSize, kTestSize, 0, format, type, nullptr);

ScopedFramebuffer dst_framebuffer(gl_);

ScopedFramebufferBinder<GL_FRAMEBUFFER> framebuffer_binder(gl_,

dst_framebuffer);