commit 1fe2f419b1687829456fd354def72b8c8a6f5fdb
author Hui Yingst <nigi@chromium.org> Wed Jun 17 19:37:11 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Jun 17 19:37:11 2020 +0000
tree 9ba763f68a379336f1f0ffb7923a019f764183db
parent ffe34d9149852e16dbb71ab594a3997030ad89fc

Fix two embeddertests for Skia/SkiaPaths.

For FPDFPPOEmbedderTest.BUG_664284 and
FPDFPPOEmbedderTest.NupRenderImage, Skia/SkiaPaths rendering results
have small discrepancies along the edges of the rectangles, due to
Skia handles thin line and subpixels differently compared to AGG, and
the discrepancies are acceptable (See rendering results:
https://bugs.chromium.org/p/pdfium/issues/detail?id=1500#c25).

This CL adds Skia/SkiaPaths results for these two embeddertests
so that they can pass.

Bug: pdfium:1500
Change-Id: I9edacb3735fcb9aba39c59c0cd160df724a13e0e
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/70650
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Hui Yingst <nigi@chromium.org>

fpdfsdk/fpdf_ppo_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_ppo_embeddertest.cpp b/fpdfsdk/fpdf_ppo_embeddertest.cpp
index 5684680..9fd2114 100644
--- a/fpdfsdk/fpdf_ppo_embeddertest.cpp
+++ b/fpdfsdk/fpdf_ppo_embeddertest.cpp
@@ -99,17 +99,16 @@
 
 // TODO(Xlou): Add more tests to check output doc content of
 // FPDF_ImportNPagesToOne()
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_NupRenderImage DISABLED_NupRenderImage
-#else
-#define MAYBE_NupRenderImage NupRenderImage
-#endif
-TEST_F(FPDFPPOEmbedderTest, MAYBE_NupRenderImage) {
+TEST_F(FPDFPPOEmbedderTest, NupRenderImage) {
   ASSERT_TRUE(OpenDocument("rectangles_multi_pages.pdf"));
   const int kPageCount = 2;
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+  static constexpr const char* kExpectedMD5s[kPageCount] = {
+      "bf8fa88dc85a9897931273168e8e1a30", "4fa6a7507e9f3ef4f28719a7d656c3a5"};
+#else
   static constexpr const char* kExpectedMD5s[kPageCount] = {
       "4d225b961da0f1bced7c83273e64c9b6", "fb18142190d770cfbc329d2b071aee4d"};
+#endif
   ScopedFPDFDocument output_doc_3up(
       FPDF_ImportNPagesToOne(document(), 792, 612, 3, 1));
   ASSERT_TRUE(output_doc_3up);
@@ -220,16 +219,16 @@
   UnloadPage(page);
 }
 
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
+TEST_F(FPDFPPOEmbedderTest, BUG_750568) {
 #if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_BUG_750568 DISABLED_BUG_750568
+  const char* const kHashes[] = {
+      "eaa139e944eafb43d31e8742a0e158de", "226485e9d4fa6a67dfe0a88723f12060",
+      "c5601a3492ae5dcc5dd25140fc463bfe", "1f60055b54de4fac8a59c65e90da156e"};
 #else
-#define MAYBE_BUG_750568 BUG_750568
-#endif
-TEST_F(FPDFPPOEmbedderTest, MAYBE_BUG_750568) {
   const char* const kHashes[] = {
       "64ad08132a1c5a166768298c8a578f57", "83b83e2f6bc80707d0a917c7634140b9",
       "913cd3723a451e4e46fbc2c05702d1ee", "81fb7cfd4860f855eb468f73dfeb6d60"};
+#endif
 
   ASSERT_TRUE(OpenDocument("bug_750568.pdf"));
   ASSERT_EQ(4, FPDF_GetPageCount(document()));