| Index: tests/GpuLayerCacheTest.cpp
|
| diff --git a/tests/GpuLayerCacheTest.cpp b/tests/GpuLayerCacheTest.cpp
|
| index 2249eba904c7dda92955bd1509a80afd53c2450f..eea81db38586162925e0d13a047eca9a45688198 100644
|
| --- a/tests/GpuLayerCacheTest.cpp
|
| +++ b/tests/GpuLayerCacheTest.cpp
|
| @@ -69,8 +69,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, nullptr == layer->texture());
|
| - REPORTER_ASSERT(reporter, nullptr == layer->paint());
|
| + REPORTER_ASSERT(reporter, !layer->texture());
|
| + REPORTER_ASSERT(reporter, !layer->paint());
|
| REPORTER_ASSERT(reporter, !layer->isAtlased());
|
| }
|
| }
|
| @@ -197,7 +197,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GpuLayerCache, reporter, ctxInfo) {
|
| } 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
|
| }
|
| @@ -258,7 +258,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GpuLayerCache, reporter, ctxInfo) {
|
| // 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 {
|
|
|