commit 0c2e668748fb26a2c9dd0368d9474914a3599f9b
author Hui Yingst <nigi@chromium.org> Mon Dec 14 19:04:56 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Dec 14 19:04:56 2020 +0000
tree a2ef0734ae38418694c282d8684c69f91e8f63d2
parent 2fb8ee5f1aca8e71a3a211c96457d15fba0d08e8

Enable PDFFlattenEmbedderTest.BUG_889099 for Skia/SkiaPaths.

When Skia/SkiaPaths is enabled, FPDFFlattenEmbedderTest.BUG_889099 have
small discrepancies on text rendering compared to AGG's expected results,
which are caused by Skia using different anti-aliasing and font face
rendering methods compared to AGG. Also there is small difference on the
background color for the matching results for |kPageHash|, which is
caused by loss of precision during Skia's premultiplied process (see
https://crbug.com/pdfium/1515#c1). However Skia and SkiaPaths still
generate acceptable rendering results.

This CL updates the Skia/SkiaPaths expected results for the test so
that it can be enabled and pass.

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

fpdfsdk/fpdf_flatten_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_flatten_embeddertest.cpp b/fpdfsdk/fpdf_flatten_embeddertest.cpp
index 93fded8..cb8d310 100644
--- a/fpdfsdk/fpdf_flatten_embeddertest.cpp
+++ b/fpdfsdk/fpdf_flatten_embeddertest.cpp
@@ -68,23 +68,26 @@
   VerifySavedDocument(100, 120, kBlankPageHash);
 }
 
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
+TEST_F(FPDFFlattenEmbedderTest, BUG_889099) {
 #if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_BUG_889099 DISABLED_BUG_889099
+  static constexpr char kPageHash[] = "ee08bafede5faf129e866cbf173bb0f3";
+  static constexpr char kFlattenedPageHash[] =
+      "e4b95ee3d450cf9ede225a2d16d101f0";
 #else
-#define MAYBE_BUG_889099 BUG_889099
-#endif
-TEST_F(FPDFFlattenEmbedderTest, MAYBE_BUG_889099) {
 #if defined(OS_WIN)
-  constexpr char kPageHash[] = "8c6e1dab0a15072f2c9c0ca240fdc739";
-  constexpr char kFlattenedPageHash[] = "9fb932ce7f370c0e68eec0a5d4d76271";
+  static constexpr char kPageHash[] = "8c6e1dab0a15072f2c9c0ca240fdc739";
+  static constexpr char kFlattenedPageHash[] =
+      "9fb932ce7f370c0e68eec0a5d4d76271";
 #elif defined(OS_APPLE)
-  constexpr char kPageHash[] = "d43f54c60b325726392a558f861402a9";
-  constexpr char kFlattenedPageHash[] = "627f143efb920a5e7ddd311e963b9c66";
+  static constexpr char kPageHash[] = "d43f54c60b325726392a558f861402a9";
+  static constexpr char kFlattenedPageHash[] =
+      "627f143efb920a5e7ddd311e963b9c66";
 #else
-  constexpr char kPageHash[] = "51f35e80dbc8a69a024b5a02aa64d463";
-  constexpr char kFlattenedPageHash[] = "ef01f57507662ec9aef7cc7cff92f96c";
+  static constexpr char kPageHash[] = "51f35e80dbc8a69a024b5a02aa64d463";
+  static constexpr char kFlattenedPageHash[] =
+      "ef01f57507662ec9aef7cc7cff92f96c";
 #endif
+#endif  // defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
 
   ASSERT_TRUE(OpenDocument("bug_889099.pdf"));
   FPDF_PAGE page = LoadPage(0);