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

Unified Diff: cc/output/direct_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/direct_renderer.cc
diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc
index ad39f1a3ed545eb86df989e8efdc993711c4ecf4..52657ac98968e094ae677d8650bc4817027f26d2 100644
--- a/cc/output/direct_renderer.cc
+++ b/cc/output/direct_renderer.cc
@@ -57,7 +57,9 @@ static gfx::Transform window_matrix(int x, int y, int width, int height) {
namespace cc {
DirectRenderer::DrawingFrame::DrawingFrame()
- : root_render_pass(NULL), current_render_pass(NULL), current_texture(NULL) {
+ : root_render_pass(nullptr),
+ current_render_pass(nullptr),
+ current_texture(nullptr) {
}
DirectRenderer::DrawingFrame::~DrawingFrame() {}
@@ -390,7 +392,7 @@ void DirectRenderer::DrawRenderPass(DrawingFrame* frame,
bool DirectRenderer::UseRenderPass(DrawingFrame* frame,
const RenderPass* render_pass) {
frame->current_render_pass = render_pass;
- frame->current_texture = NULL;
+ frame->current_texture = nullptr;
if (render_pass == frame->root_render_pass) {
BindFramebufferToOutputSurface(frame);

Powered by Google App Engine
This is Rietveld 408576698