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

src/core/SkBitmapController.cpp

diff --git a/src/core/SkBitmapController.cpp b/src/core/SkBitmapController.cpp
index fb54388..e4b4199 100644
--- a/src/core/SkBitmapController.cpp
+++ b/src/core/SkBitmapController.cpp
@@ -16,7 +16,7 @@
     if (0 == bm.width() || 0 == bm.height()) {
         return false;   // nothing to draw
     }
-    if (NULL == bm.pixelRef()) {
+    if (nullptr == bm.pixelRef()) {
         return false;   // no pixels to read
     }
     if (bm.getTexture()) {
@@ -38,14 +38,14 @@
                                                              void* storage, size_t storageSize) {
     
     if (!valid_for_drawing(bm)) {
-        return NULL;
+        return nullptr;
     }
 
     State* state = this->onRequestBitmap(bm, inv, quality, storage, storageSize);
     if (state) {
-        if (NULL == state->fPixmap.addr()) {
+        if (nullptr == state->fPixmap.addr()) {
             SkInPlaceDeleteCheck(state, storage);
-            state = NULL;
+            state = nullptr;
         }
     }
     return state;
@@ -161,21 +161,21 @@
     fQuality = kLow_SkFilterQuality;
     
     SkSize invScaleSize;
-    if (!fInvMatrix.decomposeScale(&invScaleSize, NULL)) {
+    if (!fInvMatrix.decomposeScale(&invScaleSize, nullptr)) {
         return false;
     }
     SkScalar invScale = SkScalarSqrt(invScaleSize.width() * invScaleSize.height());
     
     if (invScale > SK_Scalar1) {
         fCurrMip.reset(SkMipMapCache::FindAndRef(origBitmap));
-        if (NULL == fCurrMip.get()) {
+        if (nullptr == fCurrMip.get()) {
             fCurrMip.reset(SkMipMapCache::AddAndRef(origBitmap));
-            if (NULL == fCurrMip.get()) {
+            if (nullptr == fCurrMip.get()) {
                 return false;
             }
         }
         // diagnostic for a crasher...
-        if (NULL == fCurrMip->data()) {
+        if (nullptr == fCurrMip->data()) {
             sk_throw();
         }
         
@@ -191,7 +191,7 @@
             return fResultBitmap.installPixels(info, level.fPixels, level.fRowBytes);
         } else {
             // failed to extract, so release the mipmap
-            fCurrMip.reset(NULL);
+            fCurrMip.reset(nullptr);
         }
     }
     return false;
@@ -213,7 +213,7 @@
     SkASSERT(fQuality <= kLow_SkFilterQuality);
 
     // fResultBitmap.getPixels() may be null, but our caller knows to check fPixmap.addr()
-    // and will destroy us if it is NULL.
+    // and will destroy us if it is nullptr.
     fPixmap.reset(fResultBitmap.info(), fResultBitmap.getPixels(), fResultBitmap.rowBytes(),
                   fResultBitmap.getColorTable());
 }