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 /tools/timer | |
| parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
| download | platform_external_skqp-96fcdcc219d2a0d3579719b84b28bede76efba64.tar.gz platform_external_skqp-96fcdcc219d2a0d3579719b84b28bede76efba64.tar.bz2 platform_external_skqp-96fcdcc219d2a0d3579719b84b28bede76efba64.zip | |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'tools/timer')
| -rw-r--r-- | tools/timer/Timer.h | 2 | ||||
| -rw-r--r-- | tools/timer/TimerData.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/timer/Timer.h b/tools/timer/Timer.h index e28a515b54..9557596248 100644 --- a/tools/timer/Timer.h +++ b/tools/timer/Timer.h @@ -35,7 +35,7 @@ class SkGLContext; */ class Timer { public: - explicit Timer(SkGLContext* gl = NULL); + explicit Timer(SkGLContext* gl = nullptr); void start(); void truncatedEnd(); diff --git a/tools/timer/TimerData.cpp b/tools/timer/TimerData.cpp index 21529bc2e0..d1460f73fd 100644 --- a/tools/timer/TimerData.cpp +++ b/tools/timer/TimerData.cpp @@ -19,7 +19,7 @@ TimerData::TimerData(int maxNumTimings) , fGpuTimes(maxNumTimings) {} bool TimerData::appendTimes(Timer* timer) { - SkASSERT(timer != NULL); + SkASSERT(timer != nullptr); if (fCurrTiming >= fMaxNumTimings) { return false; } |