Index: src/core/SkTraceEvent.h |
diff --git a/src/core/SkTraceEvent.h b/src/core/SkTraceEvent.h |
index 96b6620b2ce14998fe78c7e65caa79780c2a57ba..05dc340fa2cc0a5101e6c718ec00073fce006d94 100644 |
--- a/src/core/SkTraceEvent.h |
+++ b/src/core/SkTraceEvent.h |
@@ -395,7 +395,7 @@ AddTraceEvent( |
unsigned char flags) { |
return TRACE_EVENT_API_ADD_TRACE_EVENT( |
phase, category_group_enabled, name, id, |
- kZeroNumArgs, NULL, NULL, NULL, flags); |
+ kZeroNumArgs, nullptr, nullptr, nullptr, flags); |
} |
template<class ARG1_TYPE> |
@@ -444,7 +444,7 @@ AddTraceEvent( |
class TRACE_EVENT_API_CLASS_EXPORT ScopedTracer { |
public: |
// Note: members of data_ intentionally left uninitialized. See Initialize. |
- ScopedTracer() : p_data_(NULL) {} |
+ ScopedTracer() : p_data_(nullptr) {} |
~ScopedTracer() { |
if (p_data_ && *data_.category_group_enabled) |