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

Unified Diff: content/common/gpu/client/gl_helper.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/gl_helper.h ('k') | content/common/gpu/client/gl_helper_benchmark.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/client/gl_helper.cc
diff --git a/content/common/gpu/client/gl_helper.cc b/content/common/gpu/client/gl_helper.cc
index 5aa603038fd1ac79b0a7ee7ef038574f6aa1fd9b..346d2f2e97b8e55591bc39d5c47c0a6669be9660 100644
--- a/content/common/gpu/client/gl_helper.cc
+++ b/content/common/gpu/client/gl_helper.cc
@@ -58,7 +58,7 @@ class TextureFrameBufferPair {
0,
GL_RGBA,
GL_UNSIGNED_BYTE,
- NULL);
+ nullptr);
content::ScopedFramebufferBinder<GL_FRAMEBUFFER> framebuffer_binder(
gl, framebuffer_);
gl->FramebufferTexture2D(
@@ -411,7 +411,7 @@ GLuint GLHelper::CopyTextureToImpl::ScaleTexture(
0,
format,
type,
- NULL);
+ nullptr);
}
scoped_ptr<ScalerInterface> scaler(
helper_->CreateScaler(quality,
@@ -445,7 +445,7 @@ GLuint GLHelper::CopyTextureToImpl::EncodeTextureAsGrayscale(
0,
GL_RGBA,
GL_UNSIGNED_BYTE,
- NULL);
+ nullptr);
}
helper_->InitScalerImpl();
@@ -480,7 +480,7 @@ void GLHelper::CopyTextureToImpl::ReadbackAsync(
gl_->BindBuffer(GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM, request->buffer);
gl_->BufferData(GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM,
bytes_per_pixel * dst_size.GetArea(),
- NULL,
+ nullptr,
GL_STREAM_READ);
request->query = 0u;
@@ -492,7 +492,7 @@ void GLHelper::CopyTextureToImpl::ReadbackAsync(
dst_size.height(),
format,
type,
- NULL);
+ nullptr);
gl_->EndQueryEXT(GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM);
gl_->BindBuffer(GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM, 0);
context_support_->SignalQuery(
@@ -966,7 +966,7 @@ void GLHelper::ResizeTexture(GLuint texture, const gfx::Size& size) {
0,
GL_RGB,
GL_UNSIGNED_BYTE,
- NULL);
+ nullptr);
}
void GLHelper::CopyTextureSubImage(GLuint texture, const gfx::Rect& rect) {
@@ -1210,7 +1210,7 @@ GLHelper::CopyTextureToImpl::ReadbackYUV_MRT::ReadbackYUV_MRT(
0,
GL_RGBA,
GL_UNSIGNED_BYTE,
- NULL);
+ nullptr);
DCHECK(!(dst_size.width() & 1));
DCHECK(!(dst_size.height() & 1));
« no previous file with comments | « content/common/gpu/client/gl_helper.h ('k') | content/common/gpu/client/gl_helper_benchmark.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698