diff options
| author |  Hal Canary <halcanary@google.com> | 2018-03-20 14:17:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-20 19:34:20 +0000 |
| commit | 4125b6165d4314c6c64ce12d31b2565d52c6fad3 (patch) | |
| tree | da20f131a833a9b61a30b358410fc99380be26d3 /tests/CanvasTest.cpp | |
| parent | abadbeee62976ca6bb16ca60fec8d829265996c2 (diff) | |
tests: pass if !skia_enable_pdf
Change-Id: Iff42b9a166d59b21a97fd2910d54beff1ec82969
Reviewed-on: https://skia-review.googlesource.com/115366
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'tests/CanvasTest.cpp')
| -rw-r--r-- | tests/CanvasTest.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index 3c6cb22c33..402b24729a 100644 --- a/tests/CanvasTest.cpp +++ b/tests/CanvasTest.cpp @@ -135,7 +135,9 @@ template <typename F> static void multi_canvas_driver(int w, int h, F proc) { proc(SkPictureRecorder().beginRecording(SkRect::MakeIWH(w, h))); SkNullWStream stream; - proc(SkDocument::MakePDF(&stream)->beginPage(SkIntToScalar(w), SkIntToScalar(h))); + if (auto doc = SkDocument::MakePDF(&stream)) { + proc(doc->beginPage(SkIntToScalar(w), SkIntToScalar(h))); + } proc(SkSurface::MakeRasterN32Premul(w, h, nullptr)->getCanvas()); } @@ -562,8 +564,8 @@ TEST_STEP(NestedSaveRestoreWithFlush, NestedSaveRestoreWithFlushTestStep); static void TestPdfDevice(skiatest::Reporter* reporter, const TestData& d, CanvasTestStep* step) { SkDynamicMemoryWStream outStream; sk_sp<SkDocument> doc(SkDocument::MakePDF(&outStream)); - REPORTER_ASSERT(reporter, doc); if (!doc) { + INFOF(reporter, "PDF disabled; TestPdfDevice test skipped."); return; } SkCanvas* canvas = doc->beginPage(SkIntToScalar(d.fWidth), @@ -805,7 +807,9 @@ DEF_TEST(CanvasClipType, r) { // test clipstack backend SkDynamicMemoryWStream stream; - test_cliptype(SkDocument::MakePDF(&stream)->beginPage(100, 100), r); + if (auto doc = SkDocument::MakePDF(&stream)) { + test_cliptype(doc->beginPage(100, 100), r); + } } #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |