Style Change: NULL->nullptr

src/gpu/GrAADistanceFieldPathRenderer.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAADistanceFieldPathRenderer.h"
 
@@ skipping 44 matching lines @@
             dfpr->fPathList.remove(pathData);
             delete pathData;
 #ifdef DF_PATH_TRACKING
             ++g_NumFreedPaths;
 #endif
         }
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-GrAADistanceFieldPathRenderer::GrAADistanceFieldPathRenderer() : fAtlas(NULL) {}
+GrAADistanceFieldPathRenderer::GrAADistanceFieldPathRenderer() : fAtlas(nullptr) {}
 
 GrAADistanceFieldPathRenderer::~GrAADistanceFieldPathRenderer() {
     PathDataList::Iter iter;
     iter.init(fPathList, PathDataList::Iter::kHead_IterStart);
     PathData* pathData;
     while ((pathData = iter.get())) {
         iter.next();
         fPathList.remove(pathData);
         delete pathData;
     }
@@ skipping 143 matching lines @@
             } else if (size <= kMediumMIP) {
                 desiredDimension = kMediumMIP;
             } else {
                 desiredDimension = kLargeMIP;
             }
 
             // check to see if path is cached
             // TODO: handle stroked vs. filled version of same path
             PathData::Key key = { args.fPath.getGenerationID(), desiredDimension };
             args.fPathData = fPathCache->find(key);
-            if (NULL == args.fPathData || !atlas->hasID(args.fPathData->fID)) {
+            if (nullptr == args.fPathData || !atlas->hasID(args.fPathData->fID)) {
                 // Remove the stale cache entry
                 if (args.fPathData) {
                     fPathCache->remove(args.fPathData->fKey);
                     fPathList->remove(args.fPathData);
                     delete args.fPathData;
                 }
                 SkScalar scale = desiredDimension/maxDim;
                 args.fPathData = new PathData;
                 if (!this->addPathToAtlas(target,
                                           dfProcessor,
@@ skipping 34 matching lines @@
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
     AADistanceFieldPathBatch(const Geometry& geometry, GrColor color, const SkMatrix& viewMatrix,
                              GrBatchAtlas* atlas,
                              PathCache* pathCache, PathDataList* pathList) {
         this->initClassID<AADistanceFieldPathBatch>();
         fBatch.fColor = color;
         fBatch.fViewMatrix = viewMatrix;
         fGeoData.push_back(geometry);
-        fGeoData.back().fPathData = NULL;
+        fGeoData.back().fPathData = nullptr;
 
         fAtlas = atlas;
         fPathCache = pathCache;
         fPathList = pathList;
 
         // Compute bounds
         fBounds = geometry.fPath.getBounds();
         viewMatrix.mapRect(&fBounds);
     }
 
@@ skipping 256 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef GR_TEST_UTILS
 
 struct PathTestStruct {
     typedef GrAADistanceFieldPathRenderer::PathCache PathCache;
     typedef GrAADistanceFieldPathRenderer::PathData PathData;
     typedef GrAADistanceFieldPathRenderer::PathDataList PathDataList;
-    PathTestStruct() : fContextID(SK_InvalidGenID), fAtlas(NULL) {}
+    PathTestStruct() : fContextID(SK_InvalidGenID), fAtlas(nullptr) {}
     ~PathTestStruct() { this->reset(); }
 
     void reset() {
         PathDataList::Iter iter;
         iter.init(fPathList, PathDataList::Iter::kHead_IterStart);
         PathData* pathData;
         while ((pathData = iter.get())) {
             iter.next();
             fPathList.remove(pathData);
             delete pathData;
@@ skipping 45 matching lines @@
     geometry.fPath = GrTest::TestPath(random);
     geometry.fAntiAlias = random->nextBool();
 
     return AADistanceFieldPathBatch::Create(geometry, color, viewMatrix,
                                             gTestStruct.fAtlas,
                                             &gTestStruct.fPathCache,
                                             &gTestStruct.fPathList);
 }
 
 #endif