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

Unified Diff: cc/output/gl_renderer.cc

Issue 638353002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating. 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
Index: cc/output/gl_renderer.cc
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index ac449a46f5df84bc66ffe091b6470f8c6a394cb9..219d52a6621d2f94d9c134d34338addc66d1f5ea 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -1101,7 +1101,7 @@ void GLRenderer::DrawRenderPassQuad(DrawingFrame* frame,
skia::RefPtr<SkColorFilter> cf;
{
- SkColorFilter* colorfilter_rawptr = NULL;
+ SkColorFilter* colorfilter_rawptr = nullptr;
filter->asColorFilter(&colorfilter_rawptr);
cf = skia::AdoptRef(colorfilter_rawptr);
}
@@ -1930,8 +1930,8 @@ void GLRenderer::DrawYUVVideoQuad(const DrawingFrame* frame,
0.0f, -0.5f, -0.5f,
};
- float* yuv_to_rgb = NULL;
- float* yuv_adjust = NULL;
+ float* yuv_to_rgb = nullptr;
+ float* yuv_adjust = nullptr;
switch (quad->color_space) {
case YUVVideoDrawQuad::REC_601:
@@ -2010,9 +2010,9 @@ void GLRenderer::DrawPictureQuad(const DrawingFrame* frame,
SkCanvas canvas(on_demand_tile_raster_bitmap_);
quad->picture_pile->RasterToBitmap(
- &canvas, quad->content_rect, quad->contents_scale, NULL);
+ &canvas, quad->content_rect, quad->contents_scale, nullptr);
- uint8_t* bitmap_pixels = NULL;
+ uint8_t* bitmap_pixels = nullptr;
SkBitmap on_demand_tile_raster_bitmap_dest;
SkColorType colorType = ResourceFormatToSkColorType(quad->texture_format);
if (on_demand_tile_raster_bitmap_.colorType() != colorType) {
@@ -2586,7 +2586,7 @@ void GLRenderer::GetFramebufferPixelsAsync(
GLC(gl_,
gl_->BufferData(GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM,
4 * window_rect.size().GetArea(),
- NULL,
+ nullptr,
GL_STREAM_READ));
GLuint query = 0;
@@ -2600,7 +2600,7 @@ void GLRenderer::GetFramebufferPixelsAsync(
window_rect.height(),
GL_RGBA,
GL_UNSIGNED_BYTE,
- NULL));
+ nullptr));
GLC(gl_, gl_->BindBuffer(GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM, 0));
@@ -2646,7 +2646,7 @@ void GLRenderer::FinishedReadback(unsigned source_buffer,
// Make sure we service the readbacks in order.
DCHECK_EQ(source_buffer, current_read->buffer);
- uint8* src_pixels = NULL;
+ uint8* src_pixels = nullptr;
scoped_ptr<SkBitmap> bitmap;
if (source_buffer != 0) {
@@ -2718,7 +2718,7 @@ bool GLRenderer::UseScopedTexture(DrawingFrame* frame,
const ScopedResource* texture,
const gfx::Rect& viewport_rect) {
DCHECK(texture->id());
- frame->current_render_pass = NULL;
+ frame->current_render_pass = nullptr;
frame->current_texture = texture;
return BindFramebufferToTexture(frame, texture, viewport_rect);
@@ -3148,7 +3148,7 @@ const GLRenderer::VideoYUVAProgram* GLRenderer::GetVideoYUVAProgram(
const GLRenderer::VideoStreamTextureProgram*
GLRenderer::GetVideoStreamTextureProgram(TexCoordPrecision precision) {
if (!Capabilities().using_egl_image)
- return NULL;
+ return nullptr;
DCHECK_GE(precision, 0);
DCHECK_LT(precision, NumTexCoordPrecisions);
VideoStreamTextureProgram* program =

Powered by Google App Engine
This is Rietveld 408576698