| Index: content/common/gpu/client/gpu_channel_host.cc
|
| diff --git a/content/common/gpu/client/gpu_channel_host.cc b/content/common/gpu/client/gpu_channel_host.cc
|
| index d0ceecd26211e2c255ad48504a0c40dd459782a7..55137c51b2bcf657d31b99afe7c0a30291ae9d61 100644
|
| --- a/content/common/gpu/client/gpu_channel_host.cc
|
| +++ b/content/common/gpu/client/gpu_channel_host.cc
|
| @@ -73,12 +73,12 @@ GpuChannelHost::GpuChannelHost(GpuChannelHostFactory* factory,
|
|
|
| void GpuChannelHost::Connect(const IPC::ChannelHandle& channel_handle,
|
| base::WaitableEvent* shutdown_event) {
|
| - // Open a channel to the GPU process. We pass NULL as the main listener here
|
| - // since we need to filter everything to route it to the right thread.
|
| + // Open a channel to the GPU process. We pass nullptr as the main listener
|
| + // here since we need to filter everything to route it to the right thread.
|
| scoped_refptr<base::MessageLoopProxy> io_loop = factory_->GetIOLoopProxy();
|
| channel_ = IPC::SyncChannel::Create(channel_handle,
|
| IPC::Channel::MODE_CLIENT,
|
| - NULL,
|
| + nullptr,
|
| io_loop.get(),
|
| true,
|
| shutdown_event);
|
| @@ -165,7 +165,7 @@ CommandBufferProxyImpl* GpuChannelHost::CreateViewCommandBuffer(
|
| channel_filter_.get()));
|
| }
|
|
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| CommandBufferProxyImpl* command_buffer =
|
| @@ -198,13 +198,13 @@ CommandBufferProxyImpl* GpuChannelHost::CreateOffscreenCommandBuffer(
|
| route_id,
|
| &succeeded))) {
|
| LOG(ERROR) << "Failed to send GpuChannelMsg_CreateOffscreenCommandBuffer.";
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| if (!succeeded) {
|
| LOG(ERROR)
|
| << "GpuChannelMsg_CreateOffscreenCommandBuffer returned failure.";
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| CommandBufferProxyImpl* command_buffer =
|
|
|