Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Unified Diff: content/common/gpu/gpu_channel.cc

Issue 649533003: C++11 declares a type safe null pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Presubmit errors Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/gpu_channel.h ('k') | content/common/gpu/gpu_channel_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_channel.cc
diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc
index 4290bf91fbe93ffe7c408884bde7d9d6a4f86a2b..599644ea0ee2dd96b5e6d2417ecef4c563bdd3f7 100644
--- a/content/common/gpu/gpu_channel.cc
+++ b/content/common/gpu/gpu_channel.cc
@@ -76,7 +76,7 @@ class GpuChannelMessageFilter : public IPC::MessageFilter {
bool future_sync_points)
: preemption_state_(IDLE),
gpu_channel_(gpu_channel),
- sender_(NULL),
+ sender_(nullptr),
sync_point_manager_(sync_point_manager),
message_loop_(message_loop),
messages_forwarded_to_channel_(0),
@@ -90,7 +90,7 @@ class GpuChannelMessageFilter : public IPC::MessageFilter {
virtual void OnFilterRemoved() override {
DCHECK(sender_);
- sender_ = NULL;
+ sender_ = nullptr;
}
virtual bool OnMessageReceived(const IPC::Message& message) override {
@@ -409,7 +409,7 @@ GpuChannel::GpuChannel(GpuChannelManager* gpu_channel_manager,
watchdog_(watchdog),
software_(software),
handle_messages_scheduled_(false),
- currently_processing_message_(NULL),
+ currently_processing_message_(nullptr),
num_stubs_descheduled_(0),
allow_future_sync_points_(allow_future_sync_points),
weak_factory_(this) {
@@ -511,7 +511,7 @@ void GpuChannel::RequeueMessage() {
deferred_messages_.push_front(
new IPC::Message(*currently_processing_message_));
messages_processed_--;
- currently_processing_message_ = NULL;
+ currently_processing_message_ = nullptr;
}
void GpuChannel::OnScheduled() {
@@ -667,8 +667,8 @@ void GpuChannel::HandleMessage() {
if (deferred_messages_.empty())
return;
- IPC::Message* m = NULL;
- GpuCommandBufferStub* stub = NULL;
+ IPC::Message* m = nullptr;
+ GpuCommandBufferStub* stub = nullptr;
m = deferred_messages_.front();
stub = stubs_.Lookup(m->routing_id());
@@ -691,7 +691,7 @@ void GpuChannel::HandleMessage() {
result = OnControlMessageReceived(*message);
else
result = router_.RouteMessage(*message);
- currently_processing_message_ = NULL;
+ currently_processing_message_ = nullptr;
if (!result) {
// Respond to sync messages even if router failed to route.
« no previous file with comments | « content/common/gpu/gpu_channel.h ('k') | content/common/gpu/gpu_channel_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698