[C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/…

cc/output/software_renderer.cc

Index: cc/output/software_renderer.cc
diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
index ae58b63304a10172b73165c9f2849c5f2ad53833..e9de03a05481bb4c06196c30e96f8cc6df2ee183 100644
--- a/cc/output/software_renderer.cc
+++ b/cc/output/software_renderer.cc
@@ -78,7 +78,7 @@ SoftwareRenderer::SoftwareRenderer(RendererClient* client,
       is_scissor_enabled_(false),
       is_backbuffer_discarded_(false),
       output_device_(output_surface->software_device()),
-      current_canvas_(NULL) {
+      current_canvas_(nullptr) {
   if (resource_provider_) {
     capabilities_.max_texture_size = resource_provider_->max_texture_size();
     capabilities_.best_texture_format =
@@ -108,8 +108,8 @@ void SoftwareRenderer::BeginDrawingFrame(DrawingFrame* frame) {
 void SoftwareRenderer::FinishDrawingFrame(DrawingFrame* frame) {
   TRACE_EVENT0("cc", "SoftwareRenderer::FinishDrawingFrame");
   current_framebuffer_lock_ = nullptr;
-  current_canvas_ = NULL;
-  root_canvas_ = NULL;
+  current_canvas_ = nullptr;
+  root_canvas_ = nullptr;
 
   current_frame_data_.reset(new SoftwareFrameData);
   output_device_->EndPaint(current_frame_data_.get());
@@ -349,9 +349,9 @@ void SoftwareRenderer::DrawPictureQuad(const DrawingFrame* frame,
                "SoftwareRenderer::DrawPictureQuad");
 
   quad->picture_pile->RasterDirect(
-      current_canvas_, quad->content_rect, quad->contents_scale, NULL);
+      current_canvas_, quad->content_rect, quad->contents_scale, nullptr);
 
-  current_canvas_->setDrawFilter(NULL);
+  current_canvas_->setDrawFilter(nullptr);
 }
 
 void SoftwareRenderer::DrawSolidColorQuad(const DrawingFrame* frame,
@@ -426,7 +426,7 @@ void SoftwareRenderer::DrawTextureQuad(const DrawingFrame* frame,
 
 void SoftwareRenderer::DrawTileQuad(const DrawingFrame* frame,
                                     const TileDrawQuad* quad) {
-  // |resource_provider_| can be NULL in resourceless software draws, which
+  // |resource_provider_| can be nullptr in resourceless software draws, which

[danakj, 2014/10/10 17:28:45]

just use null

   // should never produce tile quads in the first place.
   DCHECK(resource_provider_);
   DCHECK(IsSoftwareResource(quad->resource_id));