commit 7ebba630982e3e72beddd2addc7183574f275a21
author Hui Yingst <nigi@chromium.org> Fri Sep 11 20:33:44 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Sep 11 20:33:44 2020 +0000
tree 340ca97d992e98c122bec15b5fae4ea5e49685ca
parent 7a75c70012140fe11793c14d96e560087af77d25

Enable FPDFFlattenEmbedderTest.BUG_861842 for Skia.

FPDFFlattenEmbedderTest.BUG_861842 fails for Skia due to Skia uses
premultiplied colors, of which the method to merge the alpha
channel and calculate the premultiplied color results in the final
rendering colors of the checkbox background and the check mark both
being off by 1 digit compared to AGG's results (See
https://crbug.com/pdfium/1515#c1).

Since Skia's rendering results are acceptable and Skia is working as
intended, this CL adds the expected results for Skia rendering so that
this test can pass.

Bug: pdfium:1500
Change-Id: Ieeb1fb70cfbf870e6bd464276c6e104f50298337
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/73470
Reviewed-by: Lei Zhang <thestig@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 5d6a434..50db441 100644
--- a/fpdfsdk/fpdf_flatten_embeddertest.cpp
+++ b/fpdfsdk/fpdf_flatten_embeddertest.cpp
@@ -38,27 +38,31 @@
   UnloadPage(page);
 }
 
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
+TEST_F(FPDFFlattenEmbedderTest, BUG_861842) {
 #if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_BUG_861842 DISABLED_BUG_861842
-#else
-#define MAYBE_BUG_861842 BUG_861842
-#endif
-TEST_F(FPDFFlattenEmbedderTest, MAYBE_BUG_861842) {
 #if defined(OS_WIN)
-  constexpr char kCheckboxHash[] = "95fba3cb7bce7e0d3c94279f60984e17";
+  constexpr char kCheckboxChecksum[] = "ec7d1600d179aca614f2231c1f77ccb9";
 #elif defined(OS_APPLE)
-  constexpr char kCheckboxHash[] = "6aafcb2d98da222964bcdbf5aa1f4f1f";
+  constexpr char kCheckboxChecksum[] = "c7c687f93fb34a4174bdae33535e0627";
 #else
-  constexpr char kCheckboxHash[] = "594265790b81df2d93120d33b72a6ada";
+  constexpr char kCheckboxChecksum[] = "b8aecddfece463096d51596537a20b61";
 #endif
+#else
+#if defined(OS_WIN)
+  constexpr char kCheckboxChecksum[] = "95fba3cb7bce7e0d3c94279f60984e17";
+#elif defined(OS_APPLE)
+  constexpr char kCheckboxChecksum[] = "6aafcb2d98da222964bcdbf5aa1f4f1f";
+#else
+  constexpr char kCheckboxChecksum[] = "594265790b81df2d93120d33b72a6ada";
+#endif
+#endif  // defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
 
   ASSERT_TRUE(OpenDocument("bug_861842.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
 
   ScopedFPDFBitmap bitmap = RenderLoadedPageWithFlags(page, FPDF_ANNOT);
-  CompareBitmap(bitmap.get(), 100, 120, kCheckboxHash);
+  CompareBitmap(bitmap.get(), 100, 120, kCheckboxChecksum);
 
   EXPECT_EQ(FLATTEN_SUCCESS, FPDFPage_Flatten(page, FLAT_PRINT));
   EXPECT_TRUE(FPDF_SaveAsCopy(document(), this, 0));