commit dd9a3f6b043aeecafe8457a2d2c55bab4a1bb501
author Hui Yingst <nigi@chromium.org> Tue Jun 16 18:14:21 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Jun 16 18:14:21 2020 +0000
tree 27260d7addeda9a8f193e8d2ce7c128be8b3fe28
parent d452e06b175cea3e82bc62280d349e28295f603c

Enable FPDFAnnotEmbedderTest.AddAndModifyImage for SkiaPaths.

When SkiaPaths is enabled, the rendering results have acceptable
small discrepancies on the edge of texts, which is caused by Skia uses
different font face rendering methods compared to AGG (See
http://crbug.com/pdfium/1500#c7).

This CL adds SkiaPaths expected results so that this embedder test can
pass for SkiaPaths. However, this test remains disabled for Skia due to
the rendering results for Skia have the extra red dot showing and
a color block of a different size (See rendering results:
https://crbug.com/pdfium/1500#c22). This test will be enabled for Skia
once https://crbug.com/pdfium/1541 is fixed.

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

fpdfsdk/fpdf_annot_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_annot_embeddertest.cpp b/fpdfsdk/fpdf_annot_embeddertest.cpp
index b0e23a4..4dfee27 100644
--- a/fpdfsdk/fpdf_annot_embeddertest.cpp
+++ b/fpdfsdk/fpdf_annot_embeddertest.cpp
@@ -1237,13 +1237,22 @@
   UnloadPage(page);
 }
 
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+// TODO(crbug.com/pdfium/1541): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_)
 #define MAYBE_AddAndModifyImage DISABLED_AddAndModifyImage
 #else
 #define MAYBE_AddAndModifyImage AddAndModifyImage
 #endif
 TEST_F(FPDFAnnotEmbedderTest, MAYBE_AddAndModifyImage) {
+#if defined(_SKIA_SUPPORT_PATHS_)
+#if defined(OS_LINUX)
+  static const char kMd5NewImage[] = "26a8eb30937226a677839379e0d7ae1a";
+  static const char kMd5ModifiedImage[] = "2985114b32ba1a96be78ee643fe31aa5";
+#else
+  static const char kMd5NewImage[] = "14012ab500b4671fa73dd760129a8a93";
+  static const char kMd5ModifiedImage[] = "5f97f98f58ed04dc393f31460485f1a2";
+#endif  // defined(OS_LINUX)
+#else
 #if defined(OS_MACOSX)
   static const char kMd5NewImage[] = "dd18709d90c245a12ce0b8c4d092bea9";
   static const char kMd5ModifiedImage[] = "8d6f478ff8c7e67d49b253f1af587a99";
@@ -1254,6 +1263,7 @@
   static const char kMd5NewImage[] = "528e6243dc29d54f36b61e0d3287d935";
   static const char kMd5ModifiedImage[] = "6d9e59f3e57a1ff82fb258356b7eb731";
 #endif
+#endif  // defined(_SKIA_SUPPORT_PATHS_)
 
   // Open a file with two annotations and load its first page.
   ASSERT_TRUE(OpenDocument("annotation_stamp_with_ap.pdf"));