diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/core/SkTraceEvent.h | |
| parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'src/core/SkTraceEvent.h')
| -rw-r--r-- | src/core/SkTraceEvent.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkTraceEvent.h b/src/core/SkTraceEvent.h index 96b6620b2c..05dc340fa2 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) |