diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /tests/GpuLayerCacheTest.cpp | |
| parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'tests/GpuLayerCacheTest.cpp')
| -rw-r--r-- | tests/GpuLayerCacheTest.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/GpuLayerCacheTest.cpp b/tests/GpuLayerCacheTest.cpp index 411a10ba3b..95ac7b641d 100644 --- a/tests/GpuLayerCacheTest.cpp +++ b/tests/GpuLayerCacheTest.cpp @@ -46,7 +46,7 @@ static void create_layers(skiatest::Reporter* reporter, SkIRect::MakeEmpty(), SkMatrix::I(), indices, 1, - NULL); + nullptr); REPORTER_ASSERT(reporter, layer); GrCachedLayer* temp = TestingAccess::Find(cache, picture.uniqueID(), SkMatrix::I(), indices, 1); @@ -57,8 +57,8 @@ static void create_layers(skiatest::Reporter* reporter, 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, NULL == layer->texture()); - REPORTER_ASSERT(reporter, NULL == layer->paint()); + REPORTER_ASSERT(reporter, nullptr == layer->texture()); + REPORTER_ASSERT(reporter, nullptr == layer->paint()); REPORTER_ASSERT(reporter, !layer->isAtlased()); } } @@ -106,7 +106,7 @@ DEF_GPUTEST(GpuLayerCache, reporter, factory) { GrContext* context = factory->get(glCtxType); - if (NULL == context) { + if (nullptr == context) { continue; } @@ -169,7 +169,7 @@ DEF_GPUTEST(GpuLayerCache, reporter, factory) { } else { #endif // The final layer should not be atlased. - REPORTER_ASSERT(reporter, NULL == layer->texture()); + REPORTER_ASSERT(reporter, nullptr == layer->texture()); REPORTER_ASSERT(reporter, !layer->isAtlased()); #if GR_CACHE_HOISTED_LAYERS } @@ -207,12 +207,12 @@ DEF_GPUTEST(GpuLayerCache, reporter, factory) { // The one that was never atlased should still be around REPORTER_ASSERT(reporter, layer); - REPORTER_ASSERT(reporter, NULL == layer->texture()); + REPORTER_ASSERT(reporter, nullptr == 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, NULL == layer); + REPORTER_ASSERT(reporter, nullptr == layer); } #endif } @@ -242,7 +242,7 @@ DEF_GPUTEST(GpuLayerCache, reporter, factory) { // but should eliminate the free-floating layers. create_layers(reporter, &cache, *picture, kInitialNumLayers, 0); - picture.reset(NULL); + picture.reset(nullptr); cache.processDeletedPictures(); REPORTER_ASSERT(reporter, TestingAccess::NumLayers(&cache) == 0); |