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