commit 29d377b3b951eccc01a70e0b458ae9b01c230eeb
author Hui Yingst <nigi@chromium.org> Wed Mar 03 20:22:41 2021 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Mar 03 20:22:41 2021 +0000
tree 0ab141a4f9d4d2cf6af9333552e9240464c2bf97
parent f77de36ed0837bdac7beaefd17848c6964ac225b

Enable FPDFEditEmbedderTest.SaveAndRender for SkiaPaths.

For FPDFEditEmbedderTest.SaveAndRender, the rendering results have
been uploaded at [1]. There are barely visible discrepancies between
the AGG and SkiaPaths results which are casued by different
anti-aliasing and Bezier curve algorithms, and the rendering results
are both acceptable. However, the rendering result of Skia shows that
the stroke color and the fill color overlapping along the triangle
path, which is not ideal.

Therefore only enable this embedder test for SkiaPaths and link the
Skia issue with [2].

[1] https://bugs.chromium.org/p/pdfium/issues/detail?id=1500#c96
[2] https://crbug.com/pdfium/1651

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

fpdfsdk/fpdf_edit_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index 15f5f28..54b2b74 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -2937,23 +2937,27 @@
 }
 #endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+// TODO(crbug.com/pdfium/1651): Fix this issue and enable the test for Skia.
+#if defined(_SKIA_SUPPORT_)
 #define MAYBE_SaveAndRender DISABLED_SaveAndRender
 #else
 #define MAYBE_SaveAndRender SaveAndRender
 #endif
 TEST_F(FPDFEditEmbedderTest, MAYBE_SaveAndRender) {
-  const char md5[] = "3c20472b0552c0c22b88ab1ed8c6202b";
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+  static constexpr char kChecksum[] = "0e8b079e349e34f64211c495845a3529";
+#else
+  static constexpr char kChecksum[] = "3c20472b0552c0c22b88ab1ed8c6202b";
+#endif
   {
     ASSERT_TRUE(OpenDocument("bug_779.pdf"));
     FPDF_PAGE page = LoadPage(0);
     ASSERT_NE(nullptr, page);
 
-    // Now add a more complex blue path.
+    // Now add a more complex green path.
     FPDF_PAGEOBJECT green_path = FPDFPageObj_CreateNewPath(20, 20);
     EXPECT_TRUE(FPDFPageObj_SetFillColor(green_path, 0, 255, 0, 200));
-    // TODO(npm): stroking will cause the MD5s to differ.
+    // TODO(npm): stroking will cause the checksums to differ.
     EXPECT_TRUE(FPDFPath_SetDrawMode(green_path, FPDF_FILLMODE_WINDING, 0));
     EXPECT_TRUE(FPDFPath_LineTo(green_path, 20, 63));
     EXPECT_TRUE(FPDFPath_BezierTo(green_path, 55, 55, 78, 78, 90, 90));
@@ -2963,7 +2967,7 @@
     EXPECT_TRUE(FPDFPath_Close(green_path));
     FPDFPage_InsertObject(page, green_path);
     ScopedFPDFBitmap page_bitmap = RenderLoadedPage(page);
-    CompareBitmap(page_bitmap.get(), 612, 792, md5);
+    CompareBitmap(page_bitmap.get(), 612, 792, kChecksum);
 
     // Now save the result, closing the page and document
     EXPECT_TRUE(FPDFPage_GenerateContent(page));
@@ -2971,7 +2975,7 @@
     UnloadPage(page);
   }
 
-  VerifySavedDocument(612, 792, md5);
+  VerifySavedDocument(612, 792, kChecksum);
 }
 
 TEST_F(FPDFEditEmbedderTest, AddMark) {