commit e95d57745ec619c824b6a61856cb93f0043ebcfa
author Hui Yingst <nigi@chromium.org> Mon Aug 24 23:58:26 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Aug 24 23:58:26 2020 +0000
tree 3f749c5d0c3740d8df1ab89ab3c2c47b02443b01
parent a068861c3dcd61f35165434994fd75e44ac2de8f

Enable FPDFEditEmbedderTest.PathOnTopOfText for Skia/SkiaPaths.

When Skia/SkiaPaths is enabled, rendering results for
FPDFEditEmbedderTest.PathOnTopOfText have small discrepancies along the
edges of paths and texts compared to AGG's expected results due to Skia
using different anti-aliasing font face rendering methods.

This CL updates the Skia/SkiaPaths expected checksums for this test so
that it can pass.

Bug: pdfium:1500
Change-Id: I19d70bb5edf1f08e83394e21bd4a4974b3792247
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/72190
Reviewed-by: Lei Zhang <thestig@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 ffd1d51..ed3aae6 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -1852,13 +1852,7 @@
   FPDFPageObj_Destroy(img);
 }
 
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_PathOnTopOfText DISABLED_PathOnTopOfText
-#else
-#define MAYBE_PathOnTopOfText PathOnTopOfText
-#endif
-TEST_F(FPDFEditEmbedderTest, MAYBE_PathOnTopOfText) {
+TEST_F(FPDFEditEmbedderTest, PathOnTopOfText) {
   // Load document with some text
   ASSERT_TRUE(OpenDocument("hello_world.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1879,16 +1873,24 @@
   EXPECT_TRUE(FPDFPath_Close(black_path));
   FPDFPage_InsertObject(page, black_path);
 
-  // Render and check the result. Text is slightly different on Mac.
+  // Render and check the result.
   ScopedFPDFBitmap bitmap = RenderLoadedPage(page);
-#if defined(OS_APPLE)
-  const char md5[] = "e55bcd1facb7243dc6e16dd5f912265b";
-#elif defined(OS_WIN)
-  const char md5[] = "74dd9c393b8b2578d2b7feb032b7daad";
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#if defined(OS_WIN)
+  const char kChecksum[] = "e755a955696373e39dbebb5cb96e1338";
 #else
-  const char md5[] = "aa71b09b93b55f467f1290e5111babee";
+  const char kChecksum[] = "d082f9756c86bb47e1abbc2b1df7138a";
+#endif  // defined(OS_WIN)
+#else
+#if defined(OS_WIN)
+  const char kChecksum[] = "74dd9c393b8b2578d2b7feb032b7daad";
+#elif defined(OS_APPLE)
+  const char kChecksum[] = "e55bcd1facb7243dc6e16dd5f912265b";
+#else
+  const char kChecksum[] = "aa71b09b93b55f467f1290e5111babee";
 #endif
-  CompareBitmap(bitmap.get(), 200, 200, md5);
+#endif  // defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+  CompareBitmap(bitmap.get(), 200, 200, kChecksum);
   UnloadPage(page);
 }