| Index: content/common/cc_messages.cc
|
| diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc
|
| index 8ecdf0c4cea1b95fc5bf773af522bedd696cdfd6..f1e2c91a48bfd1e6cd06f1ae2619de19f6c7c05a 100644
|
| --- a/content/common/cc_messages.cc
|
| +++ b/content/common/cc_messages.cc
|
| @@ -388,7 +388,7 @@ static cc::DrawQuad* ReadDrawQuad(const Message* m,
|
| cc::RenderPass* render_pass) {
|
| QuadType* quad = render_pass->CreateAndAppendDrawQuad<QuadType>();
|
| if (!ReadParam(m, iter, quad))
|
| - return NULL;
|
| + return nullptr;
|
| return quad;
|
| }
|
|
|
| @@ -421,7 +421,7 @@ bool ParamTraits<cc::RenderPass>::Read(
|
| if (!ReadParam(m, &temp_iter, &material))
|
| return false;
|
|
|
| - cc::DrawQuad* draw_quad = NULL;
|
| + cc::DrawQuad* draw_quad = nullptr;
|
| switch (material) {
|
| case cc::DrawQuad::CHECKERBOARD:
|
| draw_quad = ReadDrawQuad<cc::CheckerboardDrawQuad>(m, iter, p);
|
|
|