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

Unified Diff: cc/layers/video_layer_impl.cc

Issue 643583003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: foramted. 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
« cc/layers/layer_client.h ('K') | « cc/layers/video_frame_provider_client_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/video_layer_impl.cc
diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc
index 5e3739728a2e8d5328236a1b7e097bbba6dc1b9c..39f549222ae16e99be79d8e45a0b327053be4e2e 100644
--- a/cc/layers/video_layer_impl.cc
+++ b/cc/layers/video_layer_impl.cc
@@ -41,7 +41,9 @@ scoped_ptr<VideoLayerImpl> VideoLayerImpl::Create(
VideoLayerImpl::VideoLayerImpl(LayerTreeImpl* tree_impl,
int id,
media::VideoRotation video_rotation)
- : LayerImpl(tree_impl, id), frame_(NULL), video_rotation_(video_rotation) {
+ : LayerImpl(tree_impl, id),
+ frame_(nullptr),
+ video_rotation_(video_rotation) {
}
VideoLayerImpl::~VideoLayerImpl() {
@@ -351,7 +353,7 @@ void VideoLayerImpl::DidDraw(ResourceProvider* resource_provider) {
}
provider_client_impl_->PutCurrentFrame(frame_);
- frame_ = NULL;
+ frame_ = nullptr;
provider_client_impl_->ReleaseLock();
}
« cc/layers/layer_client.h ('K') | « cc/layers/video_frame_provider_client_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698