commit 96fcdcc219d2a0d3579719b84b28bede76efba64
author halcanary <halcanary@google.com> Thu Aug 27 07:41:13 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 27 07:41:16 2015 -0700
tree 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd
parent 435af2f736c85c3274a0c6760a3523810750d237

Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002

Review URL: https://codereview.chromium.org/1316233002

tools/PictureBenchmark.cpp

diff --git a/tools/PictureBenchmark.cpp b/tools/PictureBenchmark.cpp
index 9a86d85..84528e5 100644
--- a/tools/PictureBenchmark.cpp
+++ b/tools/PictureBenchmark.cpp
@@ -16,12 +16,12 @@
 
 PictureBenchmark::PictureBenchmark()
     : fRepeats(1)
-    , fRenderer(NULL)
+    , fRenderer(nullptr)
     , fTimerResult(TimerData::kAvg_Result)
     , fTimerTypes(0)
     , fTimeIndividualTiles(false)
     , fPurgeDecodedTex(false)
-    , fWriter(NULL) {
+    , fWriter(nullptr) {
 }
 
 PictureBenchmark::~PictureBenchmark() {
@@ -43,11 +43,11 @@
 
 Timer* PictureBenchmark::setupTimer(bool useGLTimer) {
 #if SK_SUPPORT_GPU
-    if (useGLTimer && fRenderer != NULL && fRenderer->isUsingGpuDevice()) {
+    if (useGLTimer && fRenderer != nullptr && fRenderer->isUsingGpuDevice()) {
         return new Timer(fRenderer->getGLContext());
     }
 #endif
-    return new Timer(NULL);
+    return new Timer(nullptr);
 }
 
 PictureRenderer* PictureBenchmark::setRenderer(sk_tools::PictureRenderer* renderer) {
@@ -57,21 +57,21 @@
 
 void PictureBenchmark::run(SkPicture* pict, bool useMultiPictureDraw) {
     SkASSERT(pict);
-    if (NULL == pict) {
+    if (nullptr == pict) {
         return;
     }
 
-    SkASSERT(fRenderer != NULL);
-    if (NULL == fRenderer) {
+    SkASSERT(fRenderer != nullptr);
+    if (nullptr == fRenderer) {
         return;
     }
 
-    fRenderer->init(pict, NULL, NULL, NULL, false, useMultiPictureDraw);
+    fRenderer->init(pict, nullptr, nullptr, nullptr, false, useMultiPictureDraw);
 
     // We throw this away to remove first time effects (such as paging in this program)
     fRenderer->setup();
 
-    fRenderer->render(NULL);
+    fRenderer->render(nullptr);
     fRenderer->resetState(true);   // flush, swapBuffers and Finish
 
     if (fPurgeDecodedTex) {
@@ -109,7 +109,7 @@
     if (fTimeIndividualTiles) {
         TiledPictureRenderer* tiledRenderer = fRenderer->getTiledRenderer();
         SkASSERT(tiledRenderer && tiledRenderer->supportsTimingIndividualTiles());
-        if (NULL == tiledRenderer || !tiledRenderer->supportsTimingIndividualTiles()) {
+        if (nullptr == tiledRenderer || !tiledRenderer->supportsTimingIndividualTiles()) {
             return;
         }
         int xTiles, yTiles;
@@ -200,7 +200,7 @@
                 fRenderer->setup();
 
                 perRunTimer->start();
-                fRenderer->render(NULL);
+                fRenderer->render(nullptr);
                 perRunTimer->truncatedEnd();
                 fRenderer->resetState(false);   // flush & swapBuffers, but don't Finish
                 perRunTimer->end();