Style Change: NULL->nullptr

src/core/SkMultiPictureDraw.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.
  */
 
 // Need to include something before #if SK_SUPPORT_GPU so that the Android
 // framework build, which gets its defines from SkTypes rather than a makefile,
 // has the definition before checking it.
@@ skipping 19 matching lines @@
     fPicture = SkRef(picture);
     fCanvas = SkRef(canvas);
     if (matrix) {
         fMatrix = *matrix;
     } else {
         fMatrix.setIdentity();
     }
     if (paint) {
         fPaint = new SkPaint(*paint);
     } else {
-        fPaint = NULL;
+        fPaint = nullptr;
     }
 }
 
 void SkMultiPictureDraw::DrawData::Reset(SkTDArray<DrawData>& data) {
     for (int i = 0; i < data.count(); ++i) {
         data[i].fPicture->unref();
         data[i].fCanvas->unref();
         delete data[i].fPaint;
     }
     data.rewind();
@@ skipping 10 matching lines @@
 
 void SkMultiPictureDraw::reset() {
     DrawData::Reset(fGPUDrawData);
     DrawData::Reset(fThreadSafeDrawData);
 }
 
 void SkMultiPictureDraw::add(SkCanvas* canvas,
                              const SkPicture* picture,
                              const SkMatrix* matrix,
                              const SkPaint* paint) {
-    if (NULL == canvas || NULL == picture) {
-        SkDEBUGFAIL("parameters to SkMultiPictureDraw::add should be non-NULL");
+    if (nullptr == canvas || nullptr == picture) {
+        SkDEBUGFAIL("parameters to SkMultiPictureDraw::add should be non-nullptr");
         return;
     }
 
     SkTDArray<DrawData>& array = canvas->getGrContext() ? fGPUDrawData : fThreadSafeDrawData;
     array.append()->init(canvas, picture, matrix, paint);
 }
 
 class AutoMPDReset : SkNoncopyable {
     SkMultiPictureDraw* fMPD;
 public:
@@ skipping 89 matching lines @@
             // Find the layers required by this canvas. It will return atlased
             // layers in the 'recycled' list since they have already been drawn.
             GrLayerHoister::FindLayersToHoist(context, picture, initialMatrix,
                                               clipBounds, &needRendering, &recycled,
                                               rt->numColorSamples());
 
             GrLayerHoister::DrawLayers(context, needRendering);
 
             // Render the entire picture using new layers
             GrRecordReplaceDraw(picture, canvas, context->getLayerCache(),
-                                initialMatrix, NULL);
+                                initialMatrix, nullptr);
 
             GrLayerHoister::UnlockLayers(context, needRendering);
             GrLayerHoister::UnlockLayers(context, recycled);
 
             needRendering.rewind();
             recycled.rewind();
         } else
 #endif
         {
             canvas->drawPicture(picture, &data.fMatrix, data.fPaint);
         }
         if (flush) {
             canvas->flush();
         }
     }
 
 #if !defined(SK_IGNORE_GPU_LAYER_HOISTING) && SK_SUPPORT_GPU
     GrLayerHoister::UnlockLayers(context, atlasedNeedRendering);
     GrLayerHoister::UnlockLayers(context, atlasedRecycled);
 #if !GR_CACHE_HOISTED_LAYERS
     GrLayerHoister::PurgeCache(context);
 #endif
 #endif
 }