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

Unified Diff: content/common/gpu/client/gpu_video_encode_accelerator_host.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
Index: content/common/gpu/client/gpu_video_encode_accelerator_host.cc
diff --git a/content/common/gpu/client/gpu_video_encode_accelerator_host.cc b/content/common/gpu/client/gpu_video_encode_accelerator_host.cc
index c33e27078120b70cf04c53cc6d311716062075cd..2476f22951feb753f241814d317409f02371cfca 100644
--- a/content/common/gpu/client/gpu_video_encode_accelerator_host.cc
+++ b/content/common/gpu/client/gpu_video_encode_accelerator_host.cc
@@ -22,7 +22,7 @@ GpuVideoEncodeAcceleratorHost::GpuVideoEncodeAcceleratorHost(
CommandBufferProxyImpl* impl)
: channel_(channel),
encoder_route_id_(MSG_ROUTING_NONE),
- client_(NULL),
+ client_(nullptr),
impl_(impl),
next_frame_id_(0),
weak_this_factory_(this) {
@@ -64,7 +64,7 @@ void GpuVideoEncodeAcceleratorHost::OnChannelError() {
if (channel_) {
if (encoder_route_id_ != MSG_ROUTING_NONE)
channel_->RemoveRoute(encoder_route_id_);
- channel_ = NULL;
+ channel_ = nullptr;
}
NOTIFY_ERROR(kPlatformFailureError) << "OnChannelError()";
}
@@ -182,13 +182,13 @@ void GpuVideoEncodeAcceleratorHost::Destroy() {
DCHECK(CalledOnValidThread());
if (channel_)
Send(new AcceleratedVideoEncoderMsg_Destroy(encoder_route_id_));
- client_ = NULL;
+ client_ = nullptr;
delete this;
}
void GpuVideoEncodeAcceleratorHost::OnWillDeleteImpl() {
DCHECK(CalledOnValidThread());
- impl_ = NULL;
+ impl_ = nullptr;
// The CommandBufferProxyImpl is going away; error out this VEA.
OnChannelError();
@@ -245,7 +245,7 @@ void GpuVideoEncodeAcceleratorHost::OnNotifyInputDone(int32 frame_id) {
OnNotifyError(kPlatformFailureError);
return;
}
- frame = NULL; // Not necessary but nice to be explicit; see fun-fact above.
+ frame = nullptr; // Not necessary but nice to be explicit; see fun-fact above.
}
void GpuVideoEncodeAcceleratorHost::OnBitstreamBufferReady(
@@ -270,7 +270,7 @@ void GpuVideoEncodeAcceleratorHost::OnNotifyError(Error error) {
// Client::NotifyError() may Destroy() |this|, so calling it needs to be the
// last thing done on this stack!
- media::VideoEncodeAccelerator::Client* client = NULL;
+ media::VideoEncodeAccelerator::Client* client = nullptr;
std::swap(client_, client);
client->NotifyError(error);
}

Powered by Google App Engine
This is Rietveld 408576698