Index: cc/trees/single_thread_proxy.cc |
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc |
index 4420a1ad43a16e67c398bdfd2bed2fb34ee533ee..8a30291fc8d9eacc1c1fd4974bc262470ccd2a2d 100644 |
--- a/cc/trees/single_thread_proxy.cc |
+++ b/cc/trees/single_thread_proxy.cc |
@@ -32,7 +32,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()), |
@@ -182,7 +182,7 @@ void SingleThreadProxy::DoCommit() { |
scoped_ptr<ResourceUpdateController> update_controller = |
ResourceUpdateController::Create( |
- NULL, |
+ nullptr, |
MainThreadTaskRunner(), |
queue_for_commit_.Pass(), |
layer_tree_host_impl_->resource_provider()); |
@@ -314,7 +314,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) { |