| Index: content/common/gpu/gpu_channel_manager.cc
|
| diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc
|
| index d52bca38c8e78b91502d738a6e417968a354b3fe..f17cd7fdb1f342aeb18d63772e6b8a352db748b3 100644
|
| --- a/content/common/gpu/gpu_channel_manager.cc
|
| +++ b/content/common/gpu/gpu_channel_manager.cc
|
| @@ -29,7 +29,8 @@ class GpuChannelManagerMessageFilter : public IPC::MessageFilter {
|
| public:
|
| GpuChannelManagerMessageFilter(
|
| GpuMemoryBufferFactory* gpu_memory_buffer_factory)
|
| - : sender_(NULL), gpu_memory_buffer_factory_(gpu_memory_buffer_factory) {}
|
| + : sender_(nullptr),
|
| + gpu_memory_buffer_factory_(gpu_memory_buffer_factory) {}
|
|
|
| virtual void OnFilterAdded(IPC::Sender* sender) override {
|
| DCHECK(!sender_);
|
| @@ -38,7 +39,7 @@ class GpuChannelManagerMessageFilter : public IPC::MessageFilter {
|
|
|
| virtual void OnFilterRemoved() override {
|
| DCHECK(sender_);
|
| - sender_ = NULL;
|
| + sender_ = nullptr;
|
| }
|
|
|
| virtual bool OnMessageReceived(const IPC::Message& message) override {
|
| @@ -103,7 +104,7 @@ GpuChannelManager::~GpuChannelManager() {
|
| gpu_channels_.clear();
|
| if (default_offscreen_surface_.get()) {
|
| default_offscreen_surface_->Destroy();
|
| - default_offscreen_surface_ = NULL;
|
| + default_offscreen_surface_ = nullptr;
|
| }
|
| }
|
|
|
| @@ -146,7 +147,7 @@ void GpuChannelManager::RemoveRoute(int32 routing_id) {
|
| GpuChannel* GpuChannelManager::LookupChannel(int32 client_id) {
|
| GpuChannelMap::const_iterator iter = gpu_channels_.find(client_id);
|
| if (iter == gpu_channels_.end())
|
| - return NULL;
|
| + return nullptr;
|
| else
|
| return iter->second;
|
| }
|
| @@ -172,8 +173,8 @@ void GpuChannelManager::OnEstablishChannel(int client_id,
|
| bool allow_future_sync_points) {
|
| IPC::ChannelHandle channel_handle;
|
|
|
| - gfx::GLShareGroup* share_group = NULL;
|
| - gpu::gles2::MailboxManager* mailbox_manager = NULL;
|
| + gfx::GLShareGroup* share_group = nullptr;
|
| + gpu::gles2::MailboxManager* mailbox_manager = nullptr;
|
| if (share_context) {
|
| if (!share_group_.get()) {
|
| share_group_ = new gfx::GLShareGroup;
|
|
|