AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: pass if !skia_enable_pdf

Browse Source 
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>
This commit is contained in:
Hal Canary 2018-03-20 14:17:00 -04:00 committed by Skia Commit-Bot
parent abadbeee62
commit 4125b6165d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/CanvasTest.cpp
View File

@ -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