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

Unified Diff: cc/trees/single_thread_proxy.cc

Issue 640203002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/trees/single_thread_proxy.cc
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index 64e2ab3d15447368f32fa89320b4ba78764c1252..041ed730d5d6d5a7c54bdd95712d6d9e30b3dcfc 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -33,7 +33,7 @@ SingleThreadProxy::SingleThreadProxy(
LayerTreeHost* layer_tree_host,
LayerTreeHostSingleThreadClient* client,
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner)
- : Proxy(main_task_runner, NULL),
+ : Proxy(main_task_runner, nullptr),
layer_tree_host_(layer_tree_host),
client_(client),
timing_history_(layer_tree_host->rendering_stats_instrumentation()),
@@ -205,7 +205,7 @@ void SingleThreadProxy::DoCommit(const BeginFrameArgs& begin_frame_args) {
scoped_ptr<ResourceUpdateController> update_controller =
ResourceUpdateController::Create(
- NULL,
+ nullptr,
MainThreadTaskRunner(),
queue.Pass(),
layer_tree_host_impl_->resource_provider());
@@ -316,7 +316,7 @@ void SingleThreadProxy::Stop() {
scheduler_on_impl_thread_ = nullptr;
layer_tree_host_impl_ = nullptr;
}
- layer_tree_host_ = NULL;
+ layer_tree_host_ = nullptr;
}
void SingleThreadProxy::OnCanDrawStateChanged(bool can_draw) {

Powered by Google App Engine
This is Rietveld 408576698