aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/GpuLayerCacheTest.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2016-05-03 09:37:08 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-05-03 09:37:08 -0700
commitb4511344b61bffc02219c1282610411529ddb7f8 (patch)
tree9e02cde88c0468f0016e923162b661691467ce18 /tests/GpuLayerCacheTest.cpp
parent46db22f1cfc65a7a4f1de13d774718347362f60f (diff)
Minor refactor of GrLayerHoister
The main point of this CL is to make sure using the rect bounds (rather than the underlying texture's bounds) is acceptable in GrLayerHoister::FilterLayer. This is split out of https://codereview.chromium.org/1943913002/ (Retract GrRenderTarget from GrLayerHoister) GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1947593002 Review-Url: https://codereview.chromium.org/1947593002
Diffstat (limited to 'tests/GpuLayerCacheTest.cpp')
-rw-r--r--tests/GpuLayerCacheTest.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/GpuLayerCacheTest.cpp b/tests/GpuLayerCacheTest.cpp
index 2249eba904..eea81db385 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 {