commit 6823afb28ceb5aee566d007670180643653e85b6
author Hui Yingst <nigi@chromium.org> Tue Nov 17 05:29:53 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Nov 17 05:29:53 2020 +0000
tree 96b4785e1f96453b35e5b34c9c2766fa248f9010
parent f26b5f891b859525d6326525d5058a5b2683ddb2

Enable some Windows-only embedder tests for Skia/SkiaPaths.

Some Windows-only embedder tests are no longer failing with Skia or
SkiaPaths enabled. Therefore this CL enables these tests depending on
the configurations they can run successfully with.

Bug: pdfium:1500
Change-Id: Ia766ad9b74b19acd7651d845b3c1242910c4a462
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/76370
Commit-Queue: Hui Yingst <nigi@chromium.org>
Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>

fpdfsdk/fpdf_view_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index d9020ff..14cfa2a 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -1417,13 +1417,7 @@
 }
 
 #if defined(OS_WIN)
-// TODO(crbug.com/pdfium/1500): Fix this test and enable.
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_FPDFRenderPageEmf DISABLED_FPDFRenderPageEmf
-#else
-#define MAYBE_FPDFRenderPageEmf FPDFRenderPageEmf
-#endif
-TEST_F(FPDFViewEmbedderTest, MAYBE_FPDFRenderPageEmf) {
+TEST_F(FPDFViewEmbedderTest, FPDFRenderPageEmf) {
   ASSERT_TRUE(OpenDocument("rectangles.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -1510,13 +1504,7 @@
   UnloadPage(page);
 }
 
-// TODO(crbug.com/pdfium/1500): Fix this test and enable.
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_Image DISABLED_Image
-#else
-#define MAYBE_Image Image
-#endif
-TEST_F(PostScriptLevel2EmbedderTest, MAYBE_Image) {
+TEST_F(PostScriptLevel2EmbedderTest, Image) {
   const char kExpected[] =
       "\n"
       "save\n"
@@ -1589,13 +1577,7 @@
   UnloadPage(page);
 }
 
-// TODO(crbug.com/pdfium/1500): Fix this test and enable.
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_Image DISABLED_Image
-#else
-#define MAYBE_Image Image
-#endif
-TEST_F(PostScriptLevel3EmbedderTest, MAYBE_Image) {
+TEST_F(PostScriptLevel3EmbedderTest, Image) {
   const char kExpected[] = R"(
 save
 /im/initmatrix load def
@@ -1640,7 +1622,7 @@
 }
 
 // TODO(crbug.com/pdfium/1500): Fix this test and enable.
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#if defined(_SKIA_SUPPORT_)
 #define MAYBE_ImageMask DISABLED_ImageMask
 #else
 #define MAYBE_ImageMask ImageMask