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

Unified Diff: cc/layers/delegated_renderer_layer.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
Index: cc/layers/delegated_renderer_layer.cc
diff --git a/cc/layers/delegated_renderer_layer.cc b/cc/layers/delegated_renderer_layer.cc
index bf903052a573aa1e9668cd68d51adc91a0a8f873..f95c9bd205b1bd9077dfcb7bf4d834ffb8e032f1 100644
--- a/cc/layers/delegated_renderer_layer.cc
+++ b/cc/layers/delegated_renderer_layer.cc
@@ -22,7 +22,7 @@ DelegatedRendererLayer::DelegatedRendererLayer(
: Layer(),
frame_provider_(frame_provider),
should_collect_new_frame_(true),
- frame_data_(NULL),
+ frame_data_(nullptr),
weak_ptrs_(this) {
frame_provider_->AddObserver(this);
}
@@ -69,7 +69,7 @@ void DelegatedRendererLayer::PushPropertiesTo(LayerImpl* impl) {
if (frame_data_)
delegated_impl->SetFrameData(frame_data_, frame_damage_);
- frame_data_ = NULL;
+ frame_data_ = nullptr;
frame_damage_ = gfx::RectF();
}

Powered by Google App Engine
This is Rietveld 408576698