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

Unified Diff: cc/layers/content_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/content_layer.cc
diff --git a/cc/layers/content_layer.cc b/cc/layers/content_layer.cc
index 3bd2379cb42f276705927653664ff3763d9f06ec..d3e9a2873a8f77e482e9ab645d5d326ad175e1e5 100644
--- a/cc/layers/content_layer.cc
+++ b/cc/layers/content_layer.cc
@@ -44,7 +44,7 @@ ContentLayer::ContentLayer(ContentLayerClient* client)
ContentLayer::~ContentLayer() {}
void ContentLayer::ClearClient() {
- client_ = NULL;
+ client_ = nullptr;
UpdateDrawsContent(HasDrawableContent());
}
@@ -62,7 +62,7 @@ void ContentLayer::SetLayerTreeHost(LayerTreeHost* host) {
updater_->set_rendering_stats_instrumentation(
host->rendering_stats_instrumentation());
} else {
- updater_->set_rendering_stats_instrumentation(NULL);
+ updater_->set_rendering_stats_instrumentation(nullptr);
}
}
@@ -147,7 +147,7 @@ skia::RefPtr<SkPicture> ContentLayer::GetPicture() const {
int height = bounds().height();
SkPictureRecorder recorder;
- SkCanvas* canvas = recorder.beginRecording(width, height, NULL, 0);
+ SkCanvas* canvas = recorder.beginRecording(width, height, nullptr, 0);
client_->PaintContents(canvas,
gfx::Rect(width, height),
ContentLayerClient::GRAPHICS_CONTEXT_ENABLED);

Powered by Google App Engine
This is Rietveld 408576698