commit 57daee8ec531fa870addf4e886e1471afb9512c1
author Hui Yingst <nigi@chromium.org> Fri Oct 09 05:47:20 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Oct 09 05:47:20 2020 +0000
tree 81ad53348eaa83b464874cb01b8c662ca52ac28d
parent e0579cb2bbd567b8698e400d3d089fdee7448942

Update Skia/SkiaPaths embedder tests' macOS expected results.

FPDFAnnotEmbedderTest.ExtractInkMultiple,
FPDFAnnotEmbedderTest.AddAndSaveUnderlineAnnotation and
FPDFFormFillEmbedderTest.FormText's Skia expected results are affected
when macOS version is upgraded from 10.15.4 to 10.15.6.

This CL update the macOS expected results for these embedder tests to
match the rendering results generated by macOS version 10.15.6 (same
version as PDFium bots).

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

fpdfsdk/fpdf_annot_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_annot_embeddertest.cpp b/fpdfsdk/fpdf_annot_embeddertest.cpp
index 455ab0b..8ef97a4 100644
--- a/fpdfsdk/fpdf_annot_embeddertest.cpp
+++ b/fpdfsdk/fpdf_annot_embeddertest.cpp
@@ -526,19 +526,17 @@
     EXPECT_EQ(681.535034f, rect.top);
   }
   {
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#if defined(OS_APPLE)
+#if defined(_SKIA_SUPPORT_) && defined(OS_APPLE)
+    static constexpr char kExpectedHash[] = "fad91b9c968fe8019a774f5e2419b8fc";
+#elif defined(_SKIA_SUPPORT_PATHS_) && defined(OS_APPLE)
     static constexpr char kExpectedHash[] = "acddfe688a117ead56af7b249a2cf8a1";
-#else
+#elif defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
     static constexpr char kExpectedHash[] = "1fb0dd8dd5f0b9bb8d076e48eb59296d";
-#endif  // defined(OS_APPLE)
-#else
-#if defined(OS_WIN)
+#elif defined(OS_WIN)
     static constexpr char kExpectedHash[] = "49d0a81c636531a337429325273d0508";
 #else
     static constexpr char kExpectedHash[] = "354002e1c4386d38fdde29ef8d61074a";
-#endif  // defined(OS_WIN)
-#endif  // defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#endif
     ScopedFPDFBitmap bitmap = RenderLoadedPageWithFlags(page, FPDF_ANNOT);
     CompareBitmap(bitmap.get(), 612, 792, kExpectedHash);
   }
@@ -677,7 +675,11 @@
   UnloadPage(page);
 
   // Open the saved document.
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#if defined(_SKIA_SUPPORT_) && defined(OS_APPLE)
+  static const char kChecksum[] = "899387ae792390cd0d83cf7e2bbebfb5";
+#elif defined(_SKIA_SUPPORT_PATHS_) && defined(OS_APPLE)
+  static const char kChecksum[] = "e40e235ee35f47ff28dda009aaaf36df";
+#elif defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
   static const char kChecksum[] = "798fa41303381c9ba6d99092f5cd4d2b";
 #else
   static const char kChecksum[] = "dba153419f67b7c0c0e3d22d3e8910d5";

fpdfsdk/fpdf_formfill_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_formfill_embeddertest.cpp b/fpdfsdk/fpdf_formfill_embeddertest.cpp
index fa1c505..1efbb8f 100644
--- a/fpdfsdk/fpdf_formfill_embeddertest.cpp
+++ b/fpdfsdk/fpdf_formfill_embeddertest.cpp
@@ -1319,10 +1319,17 @@
 
 TEST_F(FPDFFormFillEmbedderTest, FormText) {
 #if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#if defined(OS_APPLE)
+  const char kFocusedTextFormWithAbcChecksum[] =
+      "7f4d3e883301c08b3ca2f53cb78adc58";
+  const char kUnfocusedTextFormWithAbcChecksum[] =
+      "92aa287f6208ad0c78210e68e2a731a3";
+#else
   const char kFocusedTextFormWithAbcChecksum[] =
       "e2e2b4e4c7ebd6485a2c0745e41c0115";
   const char kUnfocusedTextFormWithAbcChecksum[] =
       "84e808922efcceb82f36d55ed4b2752e";
+#endif  // defined(OS_APPLE)
 #else
 #if defined(OS_APPLE)
   const char kFocusedTextFormWithAbcChecksum[] =