| 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));
|
|
|