Style Change: NULL->nullptr

src/core/SkRecorder.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 "SkBigPicture.h"
 #include "SkCanvasPriv.h"
 #include "SkPatchUtils.h"
 #include "SkPicture.h"
 #include "SkPictureUtils.h"
 #include "SkRecorder.h"
 
 //#define WRAP_BITMAP_AS_IMAGE
 
 SkDrawableList::~SkDrawableList() {
     fArray.unrefAll();
 }
 
 SkBigPicture::SnapshotArray* SkDrawableList::newDrawableSnapshot() {
     const int count = fArray.count();
     if (0 == count) {
-        return NULL;
+        return nullptr;
     }
     SkAutoTMalloc<const SkPicture*> pics(count);
     for (int i = 0; i < count; ++i) {
         pics[i] = fArray[i]->newPictureSnapshot();
     }
     return new SkBigPicture::SnapshotArray(pics.detach(), count);
 }
 
 void SkDrawableList::append(SkDrawable* drawable) {
     *fArray.append() = SkRef(drawable);
@@ skipping 18 matching lines @@
 void SkRecorder::reset(SkRecord* record, const SkRect& bounds,
                        DrawPictureMode dpm, SkMiniRecorder* mr) {
     this->forgetRecord();
     fDrawPictureMode = dpm;
     fRecord = record;
     this->resetForNextPicture(bounds.roundOut());
     fMiniRecorder = mr;
 }
 
 void SkRecorder::forgetRecord() {
-    fDrawableList.reset(NULL);
+    fDrawableList.reset(nullptr);
     fApproxBytesUsedBySubPictures = 0;
-    fRecord = NULL;
+    fRecord = nullptr;
 }
 
 // To make appending to fRecord a little less verbose.
 #define APPEND(T, ...)             \
     if (fMiniRecorder) {           \
         this->flushMiniRecorder(); \
     }                              \
     new (fRecord->append<SkRecords::T>()) SkRecords::T(__VA_ARGS__)
 
 #define TRY_MINIRECORDER(method, ...)                       \
     if (fMiniRecorder && fMiniRecorder->method(__VA_ARGS__)) { return; }
 
 // For methods which must call back into SkCanvas.
 #define INHERITED(method, ...) this->SkCanvas::method(__VA_ARGS__)
 
 // Use copy() only for optional arguments, to be copied if present or skipped if not.
 // (For most types we just pass by value and let copy constructors do their thing.)
 template <typename T>
 T* SkRecorder::copy(const T* src) {
-    if (NULL == src) {
-        return NULL;
+    if (nullptr == src) {
+        return nullptr;
     }
     return new (fRecord->alloc<T>()) T(*src);
 }
 
 // This copy() is for arrays.
 // It will work with POD or non-POD, though currently we only use it for POD.
 template <typename T>
 T* SkRecorder::copy(const T src[], size_t count) {
-    if (NULL == src) {
-        return NULL;
+    if (nullptr == src) {
+        return nullptr;
     }
     T* dst = fRecord->alloc<T>(count);
     for (size_t i = 0; i < count; i++) {
         new (dst + i) T(src[i]);
     }
     return dst;
 }
 
 // Specialization for copying strings, using memcpy.
 // This measured around 2x faster for copying code points,
 // but I found no corresponding speedup for other arrays.
 template <>
 char* SkRecorder::copy(const char src[], size_t count) {
-    if (NULL == src) {
-        return NULL;
+    if (nullptr == src) {
+        return nullptr;
     }
     char* dst = fRecord->alloc<char>(count);
     memcpy(dst, src, count);
     return dst;
 }
 
 // As above, assuming and copying a terminating \0.
 template <>
 char* SkRecorder::copy(const char* src) {
     return this->copy(src, strlen(src)+1);
@@ skipping 173 matching lines @@
 
 void SkRecorder::onDrawVertices(VertexMode vmode,
                                 int vertexCount, const SkPoint vertices[],
                                 const SkPoint texs[], const SkColor colors[],
                                 SkXfermode* xmode,
                                 const uint16_t indices[], int indexCount, const SkPaint& paint) {
     APPEND(DrawVertices, paint,
                          vmode,
                          vertexCount,
                          this->copy(vertices, vertexCount),
-                         texs ? this->copy(texs, vertexCount) : NULL,
-                         colors ? this->copy(colors, vertexCount) : NULL,
+                         texs ? this->copy(texs, vertexCount) : nullptr,
+                         colors ? this->copy(colors, vertexCount) : nullptr,
                          xmode,
                          this->copy(indices, indexCount),
                          indexCount);
 }
 
 void SkRecorder::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
                              const SkPoint texCoords[4], SkXfermode* xmode, const SkPaint& paint) {
     APPEND(DrawPatch, paint,
-           cubics ? this->copy(cubics, SkPatchUtils::kNumCtrlPts) : NULL,
-           colors ? this->copy(colors, SkPatchUtils::kNumCorners) : NULL,
-           texCoords ? this->copy(texCoords, SkPatchUtils::kNumCorners) : NULL,
+           cubics ? this->copy(cubics, SkPatchUtils::kNumCtrlPts) : nullptr,
+           colors ? this->copy(colors, SkPatchUtils::kNumCorners) : nullptr,
+           texCoords ? this->copy(texCoords, SkPatchUtils::kNumCorners) : nullptr,
            xmode);
 }
 
 void SkRecorder::onDrawAtlas(const SkImage* atlas, const SkRSXform xform[], const SkRect tex[],
                              const SkColor colors[], int count, SkXfermode::Mode mode,
                              const SkRect* cull, const SkPaint* paint) {
     APPEND(DrawAtlas, this->copy(paint),
            atlas,
            this->copy(xform, count),
            this->copy(tex, count),
@@ skipping 47 matching lines @@
     INHERITED(onClipPath, path, op, edgeStyle);
     SkRecords::RegionOpAndAA opAA(op, kSoft_ClipEdgeStyle == edgeStyle);
     APPEND(ClipPath, this->devBounds(), path, opAA);
 }
 
 void SkRecorder::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
     INHERITED(onClipRegion, deviceRgn, op);
     APPEND(ClipRegion, this->devBounds(), deviceRgn, op);
 }