| Index: tests/CanvasTest.cpp
|
| diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
|
| index 6182d95ffc4302c841dd8c2d2b7365c1c8db4947..26bd631de228f8128967741290bda849d7a2389c 100644
|
| --- a/tests/CanvasTest.cpp
|
| +++ b/tests/CanvasTest.cpp
|
| @@ -545,16 +545,16 @@ public:
|
| SkCanvas::LayerIter layerIter2(const_cast<SkCanvas*>(canvas2), false);
|
| while (!layerIter1.done() && !layerIter2.done()) {
|
| if (layerIter1.matrix() != layerIter2.matrix()) {
|
| - return false;
|
| + return false;
|
| }
|
| if (layerIter1.clip() != layerIter2.clip()) {
|
| return false;
|
| }
|
| if (layerIter1.paint() != layerIter2.paint()) {
|
| - return false;
|
| + return false;
|
| }
|
| if (layerIter1.x() != layerIter2.x()) {
|
| - return false;
|
| + return false;
|
| }
|
| if (layerIter1.y() != layerIter2.y()) {
|
| return false;
|
| @@ -602,7 +602,7 @@ static void AssertCanvasStatesEqual(skiatest::Reporter* reporter, const TestData
|
| canvas2->getTotalMatrix(), testStep->assertMessage());
|
| REPORTER_ASSERT_MESSAGE(reporter, equal_clips(*canvas1, *canvas2), testStep->assertMessage());
|
|
|
| - REPORTER_ASSERT_MESSAGE(reporter,
|
| + REPORTER_ASSERT_MESSAGE(reporter,
|
| CanvasTestingAccess::SameState(canvas1, canvas2),
|
| testStep->assertMessage());
|
| }
|
| @@ -612,11 +612,7 @@ static void TestPdfDevice(skiatest::Reporter* reporter,
|
| CanvasTestStep* testStep) {
|
| SkDynamicMemoryWStream outStream;
|
| sk_sp<SkDocument> doc(SkDocument::MakePDF(&outStream));
|
| -#if SK_SUPPORT_PDF
|
| REPORTER_ASSERT(reporter, doc);
|
| -#else
|
| - REPORTER_ASSERT(reporter, !doc);
|
| -#endif // SK_SUPPORT_PDF
|
| if (!doc) {
|
| return;
|
| }
|
|
|