tests/CanvasTest.cpp - Issue 1278403006: SkPDF: clean up overuse of SK_SUPPORT_PDF

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tests/CanvasTest.cpp

Issue 1278403006: SkPDF: clean up overuse of SK_SUPPORT_PDF (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: tests/CanvasTest.cpp

diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp

index 78253ac900166f590bc28aa0087af40738813ebb..0a6ba0d0046641509dff6f5a04895a66b4bbd02e 100644

--- a/tests/CanvasTest.cpp

+++ b/tests/CanvasTest.cpp

@@ -568,8 +568,9 @@ static void TestPdfDevice(skiatest::Reporter* reporter,

CanvasTestStep* testStep) {

SkDynamicMemoryWStream outStream;

SkAutoTUnref<SkDocument> doc(SkDocument::CreatePDF(&outStream));

-#if SK_SUPPORT_PDF

- REPORTER_ASSERT(reporter, doc);

+ if (!doc) {

+ return;

reed1 2015/08/11 19:08:47 Should we assert that we failed only when PDF was

hal.canary 2015/08/11 20:26:15 Done.

+ }

SkCanvas* canvas = doc->beginPage(SkIntToScalar(d.fWidth),

SkIntToScalar(d.fHeight));

REPORTER_ASSERT(reporter, canvas);

@@ -577,9 +578,6 @@ static void TestPdfDevice(skiatest::Reporter* reporter,

testStep->draw(canvas, d, reporter);

REPORTER_ASSERT(reporter, doc->close());

-#else

- REPORTER_ASSERT(reporter, !doc);

-#endif // SK_SUPPORT_PDF

}

// The following class groups static functions that need to access

« no previous file with comments | « tests/AnnotationTest.cpp ('k') | tests/DeflateWStream.cpp » ('j') | no next file with comments »