Index: cc/trees/thread_proxy.cc |
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc |
index 1c75993681150191623db568a75e03e34ec3830b..ad9ba7e20eca7b8c29445a2842e6f25f3c3e91bc 100644 |
--- a/cc/trees/thread_proxy.cc |
+++ b/cc/trees/thread_proxy.cc |
@@ -101,9 +101,9 @@ ThreadProxy::CompositorThreadOnly::CompositorThreadOnly( |
int layer_tree_host_id, |
RenderingStatsInstrumentation* rendering_stats_instrumentation) |
: layer_tree_host_id(layer_tree_host_id), |
- contents_texture_manager(NULL), |
- commit_completion_event(NULL), |
- completion_event_for_commit_held_on_tree_activation(NULL), |
+ contents_texture_manager(nullptr), |
+ commit_completion_event(nullptr), |
+ completion_event_for_commit_held_on_tree_activation(nullptr), |
next_frame_is_newly_committed_frame(false), |
inside_draw(false), |
input_throttled_until_commit(false), |
@@ -621,7 +621,7 @@ void ThreadProxy::Stop() { |
} |
main().weak_factory.InvalidateWeakPtrs(); |
- blocked_main().layer_tree_host = NULL; |
+ blocked_main().layer_tree_host = nullptr; |
main().started = false; |
} |
@@ -979,10 +979,10 @@ void ThreadProxy::ScheduledActionCommit() { |
TRACE_EVENT_INSTANT0("cc", "HoldCommit", TRACE_EVENT_SCOPE_THREAD); |
impl().completion_event_for_commit_held_on_tree_activation = |
impl().commit_completion_event; |
- impl().commit_completion_event = NULL; |
+ impl().commit_completion_event = nullptr; |
} else { |
impl().commit_completion_event->Signal(); |
- impl().commit_completion_event = NULL; |
+ impl().commit_completion_event = nullptr; |
} |
// Delay this step until afer the main thread has been released as it's |
@@ -1245,7 +1245,7 @@ void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) { |
// we should moved the notifier (and RenewTreePriority) to LTHI. See |
// crbug.com/411972 |
impl().smoothness_priority_expiration_notifier.Cancel(); |
- impl().contents_texture_manager = NULL; |
+ impl().contents_texture_manager = nullptr; |
completion->Signal(); |
} |
@@ -1379,7 +1379,7 @@ void ThreadProxy::DidActivateSyncTree() { |
"cc", "ReleaseCommitbyActivation", TRACE_EVENT_SCOPE_THREAD); |
DCHECK(impl().layer_tree_host_impl->settings().impl_side_painting); |
impl().completion_event_for_commit_held_on_tree_activation->Signal(); |
- impl().completion_event_for_commit_held_on_tree_activation = NULL; |
+ impl().completion_event_for_commit_held_on_tree_activation = nullptr; |
} |
UpdateBackgroundAnimateTicking(); |