diff options
| author |  mtklein <mtklein@chromium.org> | 2016-08-02 12:20:36 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-02 12:20:36 -0700 |
| commit | 757a15fa2e5b8ad46e422ad7e4c10bb5fcb8cae0 (patch) | |
| tree | c2db69a3117fc1eb4019f135cf95072536221fbb /tests/CanvasTest.cpp | |
| parent | 15ee3deee8aca2bf6e658449f25ee34a8153e6ee (diff) | |
not much point to SK_SUPPORT_PDF
It only controls a few minor things in testing tools,
which can always assume PDF support is present.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2202203003
Review-Url: https://codereview.chromium.org/2202203003
Diffstat (limited to 'tests/CanvasTest.cpp')
| -rw-r--r-- | tests/CanvasTest.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index 6182d95ffc..26bd631de2 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; } |