From 446ee67fda73b11281b8e28a68edec811347c0c5 Mon Sep 17 00:00:00 2001 From: hendrikw Date: Tue, 16 Jun 2015 09:28:37 -0700 Subject: skia: Add runtime option to disable picture IO security precautions Replaced the compile time file IO security setting with a runtime setting. Unfortunately the setting is global. Review URL: https://codereview.chromium.org/1183853003 --- tests/ImageFilterTest.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'tests/ImageFilterTest.cpp') diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index fc709da5af..20bf0aa6d3 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -859,12 +859,10 @@ DEF_TEST(ImageFilterCrossProcessPictureImageFilter, reporter) { canvas.clear(0x0); canvas.drawPicture(crossProcessPicture); pixel = *bitmap.getAddr32(0, 0); -#ifdef SK_DISALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS - // The result here should not be green, since the filter draws nothing. - REPORTER_ASSERT(reporter, pixel != SK_ColorGREEN); -#else - REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN); -#endif + // If the security precautions are enabled, the result here should not be green, since the + // filter draws nothing. + REPORTER_ASSERT(reporter, SkPicture::PictureIOSecurityPrecautionsEnabled() + ? pixel != SK_ColorGREEN : pixel == SK_ColorGREEN); } DEF_TEST(ImageFilterClippedPictureImageFilter, reporter) { -- cgit v1.2.3