| Index: tests/ClipStackTest.cpp
|
| diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp
|
| index 0620df947b5f53acab6a4e63c67a196120e1c051..662e68040e71db3a1064235f3195d223c385f87f 100644
|
| --- a/tests/ClipStackTest.cpp
|
| +++ b/tests/ClipStackTest.cpp
|
| @@ -980,12 +980,12 @@ static void test_reduced_clip_stack(skiatest::Reporter* reporter) {
|
| // whether the result is bounded or not, the whole plane should start outside the clip.
|
| reducedStack.clipEmpty();
|
| }
|
| - for (ElementList::Iter iter = reducedClips.headIter(); NULL != iter.get(); iter.next()) {
|
| + for (ElementList::Iter iter = reducedClips.headIter(); iter.get(); iter.next()) {
|
| add_elem_to_stack(*iter.get(), &reducedStack);
|
| }
|
|
|
| // GrReducedClipStack assumes that the final result is clipped to the returned bounds
|
| - if (NULL != tightBounds) {
|
| + if (tightBounds) {
|
| reducedStack.clipDevRect(*tightBounds, SkRegion::kIntersect_Op);
|
| }
|
|
|
| @@ -1191,7 +1191,7 @@ DEF_TEST(ClipStack, reporter) {
|
| SkRect answer;
|
| answer.iset(25, 25, 75, 75);
|
|
|
| - REPORTER_ASSERT(reporter, NULL != element);
|
| + REPORTER_ASSERT(reporter, element);
|
| REPORTER_ASSERT(reporter, SkClipStack::Element::kRect_Type == element->getType());
|
| REPORTER_ASSERT(reporter, SkRegion::kIntersect_Op == element->getOp());
|
| REPORTER_ASSERT(reporter, element->getRect() == answer);
|
|
|