| Index: mojo/cc/context_provider_mojo.cc
|
| diff --git a/mojo/cc/context_provider_mojo.cc b/mojo/cc/context_provider_mojo.cc
|
| index 16c6f8c6ac2bc2a84e17287b827a84e797da9497..3bfd1a160165367f49507467a47a549ec1bec1ff 100644
|
| --- a/mojo/cc/context_provider_mojo.cc
|
| +++ b/mojo/cc/context_provider_mojo.cc
|
| @@ -12,6 +12,7 @@ namespace mojo {
|
| ContextProviderMojo::ContextProviderMojo(
|
| ScopedMessagePipeHandle command_buffer_handle)
|
| : command_buffer_handle_(command_buffer_handle.Pass()),
|
| + context_(nullptr),
|
| context_lost_(false) {
|
| }
|
|
|
| @@ -26,14 +27,14 @@ bool ContextProviderMojo::BindToCurrentThread() {
|
|
|
| gpu::gles2::GLES2Interface* ContextProviderMojo::ContextGL() {
|
| if (!context_)
|
| - return NULL;
|
| + return nullptr;
|
| return static_cast<gpu::gles2::GLES2Interface*>(
|
| MojoGLES2GetGLES2Interface(context_));
|
| }
|
|
|
| gpu::ContextSupport* ContextProviderMojo::ContextSupport() {
|
| if (!context_)
|
| - return NULL;
|
| + return nullptr;
|
| return static_cast<gpu::ContextSupport*>(
|
| MojoGLES2GetContextSupport(context_));
|
| }
|
|
|