Minor refactor of GrLayerHoister

tests/GpuLayerCacheTest.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.
 */
 
 #if SK_SUPPORT_GPU
 
 #include "GrContext.h"
@@ skipping 51 matching lines @@
         REPORTER_ASSERT(reporter, layer);
         GrCachedLayer* temp = TestingAccess::Find(cache, picture.uniqueID(), SkMatrix::I(),
                                                   key, 1);
         REPORTER_ASSERT(reporter, temp == layer);
 
         REPORTER_ASSERT(reporter, TestingAccess::NumLayers(cache) == idOffset + i + 1);
 
         REPORTER_ASSERT(reporter, picture.uniqueID() == layer->pictureID());
         REPORTER_ASSERT(reporter, layer->start() == idOffset + i + 1);
         REPORTER_ASSERT(reporter, layer->stop() == idOffset + i + 2);
-        REPORTER_ASSERT(reporter, nullptr == layer->texture());
-        REPORTER_ASSERT(reporter, nullptr == layer->paint());
+        REPORTER_ASSERT(reporter, !layer->texture());
+        REPORTER_ASSERT(reporter, !layer->paint());
         REPORTER_ASSERT(reporter, !layer->isAtlased());
     }
 }
 
 static void lock_layer(skiatest::Reporter* reporter,
                        GrLayerCache* cache,
                        GrCachedLayer* layer) {
     // Make each layer big enough to consume one whole plot in the atlas
     GrSurfaceDesc desc;
     desc.fFlags = kRenderTarget_GrSurfaceFlag;
@@ skipping 106 matching lines @@
         // When hoisted layers aren't cached they are aggressively removed
         // from the atlas
 #if GR_CACHE_HOISTED_LAYERS
         // The first 4 layers should still be in the atlas.
         if (i < 4) {
             REPORTER_ASSERT(reporter, layer->texture());
             REPORTER_ASSERT(reporter, layer->isAtlased());
         } else {
 #endif
             // The final layer should not be atlased.
-            REPORTER_ASSERT(reporter, nullptr == layer->texture());
+            REPORTER_ASSERT(reporter, !layer->texture());
             REPORTER_ASSERT(reporter, !layer->isAtlased());
 #if GR_CACHE_HOISTED_LAYERS
         }
 #endif
     }
 
     // Let go of the backing texture
     cache.end();
     REPORTER_ASSERT(reporter, nullptr == TestingAccess::GetBackingTexture(&cache));
 
@@ skipping 40 matching lines @@
         if (1 == i || 2 == i || 3 == i || 5 == i) {
             REPORTER_ASSERT(reporter, layer);
             REPORTER_ASSERT(reporter, !layer->locked());
             REPORTER_ASSERT(reporter, layer->texture());
             REPORTER_ASSERT(reporter, layer->isAtlased());
         } else if (4 == i) {
 #endif
             // The one that was never atlased should still be around
             REPORTER_ASSERT(reporter, layer);
 
-            REPORTER_ASSERT(reporter, nullptr == layer->texture());
+            REPORTER_ASSERT(reporter, !layer->texture());
             REPORTER_ASSERT(reporter, !layer->isAtlased());
 #if GR_CACHE_HOISTED_LAYERS
         } else {
             // The one bumped out of the atlas (i.e., 0) should be gone
             REPORTER_ASSERT(reporter, nullptr == layer);
         }
 #endif
     }
 
     //--------------------------------------------------------------------
@@ skipping 88 matching lines @@
     cache.end();
 
 #if GR_CACHE_STATS
     resourceCache->getStats(&stats);
     REPORTER_ASSERT(reporter, 2 == stats.fTotal);
     REPORTER_ASSERT(reporter, 2 == stats.fNumPurgeable);
 #endif
 }
 
 #endif