commit a2704b97c06eb770fc8c42cbe1abff960020e218
author Hui Yingst <nigi@chromium.org> Tue Apr 14 20:08:06 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Apr 14 20:08:06 2020 +0000
tree b31722650d85af5beff1801aef3518b043aa2334
parent 671aece845dd17d61a9f223ac41c6a50aa5145c2

Update the expected results of FPDFTransformEmbedderTest for Skia.

With Skia or SkiaPaths enabled, multiple embedder tests in
FPDFTransformEmbedderTest fail when rendering rectangles.pdf without
having very visible differences between the rendering results and the
expected results generated by AGG.

Since the discrepancy was caused by Skia's own way of hairline handling
and it's expected to happen when rectangles are relatively small, this
CL adds the expected results for using Skia/SkiaPaths to make the
embedder tests succeed, and consolidates the common expected hash
values in the same file.

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

fpdfsdk/fpdf_transformpage_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_transformpage_embeddertest.cpp b/fpdfsdk/fpdf_transformpage_embeddertest.cpp
index 6ebb8d2..ef9d768 100644
--- a/fpdfsdk/fpdf_transformpage_embeddertest.cpp
+++ b/fpdfsdk/fpdf_transformpage_embeddertest.cpp
@@ -11,6 +11,18 @@
 #include "third_party/base/test/scoped_locale.h"
 #endif
 
+namespace {
+
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+constexpr char kOriginalMD5[] = "b4e411a6b5ffa59a50efede2efece597";
+constexpr char kShrunkMD5[] = "78c52d6029283090036e6db6683401e2";
+#else
+constexpr char kOriginalMD5[] = "0a90de37f52127619c3dfb642b5fa2fe";
+constexpr char kShrunkMD5[] = "f4136cc9209207ab60eb8381a3df2e69";
+#endif
+
+}  // namespace
+
 class FPDFTransformEmbedderTest : public EmbedderTest {};
 
 TEST_F(FPDFTransformEmbedderTest, GetBoundingBoxes) {
@@ -194,16 +206,12 @@
   UnloadPage(page);
 }
 
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
+TEST_F(FPDFTransformEmbedderTest, SetCropBox) {
 #if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_SetCropBox DISABLED_SetCropBox
+  const char kCroppedMD5[] = "4b9d2d2246be61c583f454245fe3172f";
 #else
-#define MAYBE_SetCropBox SetCropBox
-#endif
-TEST_F(FPDFTransformEmbedderTest, MAYBE_SetCropBox) {
-  const char kOriginalMD5[] = "0a90de37f52127619c3dfb642b5fa2fe";
   const char kCroppedMD5[] = "9937883715d5144c079fb8f7e3d4f395";
-
+#endif
   {
     ASSERT_TRUE(OpenDocument("rectangles.pdf"));
     FPDF_PAGE page = LoadPage(0);
@@ -273,15 +281,12 @@
   }
 }
 
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
+TEST_F(FPDFTransformEmbedderTest, SetMediaBox) {
 #if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_SetMediaBox DISABLED_SetMediaBox
+  const char kShrunkMD5SetMediaBox[] = "9f28f0610a7f789c24cfd5f9bd5dc3de";
 #else
-#define MAYBE_SetMediaBox SetMediaBox
+  const char kShrunkMD5SetMediaBox[] = "eab5958f62f7ce65d7c32de98389fee1";
 #endif
-TEST_F(FPDFTransformEmbedderTest, MAYBE_SetMediaBox) {
-  const char kOriginalMD5[] = "0a90de37f52127619c3dfb642b5fa2fe";
-  const char kShrunkMD5[] = "eab5958f62f7ce65d7c32de98389fee1";
 
   {
     ASSERT_TRUE(OpenDocument("rectangles.pdf"));
@@ -319,7 +324,8 @@
       EXPECT_EQ(80, page_width);
       EXPECT_EQ(120, page_height);
       ScopedFPDFBitmap bitmap = RenderLoadedPage(page);
-      CompareBitmap(bitmap.get(), page_width, page_height, kShrunkMD5);
+      CompareBitmap(bitmap.get(), page_width, page_height,
+                    kShrunkMD5SetMediaBox);
     }
 
     UnloadPage(page);
@@ -346,7 +352,7 @@
     EXPECT_EQ(80, page_width);
     EXPECT_EQ(120, page_height);
     ScopedFPDFBitmap bitmap = RenderSavedPage(saved_page);
-    CompareBitmap(bitmap.get(), page_width, page_height, kShrunkMD5);
+    CompareBitmap(bitmap.get(), page_width, page_height, kShrunkMD5SetMediaBox);
 
     CloseSavedPage(saved_page);
     CloseSavedDocument();
@@ -412,16 +418,7 @@
   UnloadPage(page);
 }
 
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_TransFormWithClipAndSave DISABLED_TransFormWithClipAndSave
-#else
-#define MAYBE_TransFormWithClipAndSave TransFormWithClipAndSave
-#endif
-TEST_F(FPDFTransformEmbedderTest, MAYBE_TransFormWithClipAndSave) {
-  const char kOriginalMD5[] = "0a90de37f52127619c3dfb642b5fa2fe";
-  const char kShrunkMD5[] = "f4136cc9209207ab60eb8381a3df2e69";
-
+TEST_F(FPDFTransformEmbedderTest, TransFormWithClipAndSave) {
   {
     ASSERT_TRUE(OpenDocument("rectangles.pdf"));
     FPDF_PAGE page = LoadPage(0);
@@ -476,18 +473,7 @@
 }
 
 #if defined(OS_LINUX) || defined(OS_FUCHSIA)
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_TransFormWithClipAndSaveWithLocale \
-  DISABLED_TransFormWithClipAndSaveWithLocale
-#else
-#define MAYBE_TransFormWithClipAndSaveWithLocale \
-  TransFormWithClipAndSaveWithLocale
-#endif
-TEST_F(FPDFTransformEmbedderTest, MAYBE_TransFormWithClipAndSaveWithLocale) {
-  const char kOriginalMD5[] = "0a90de37f52127619c3dfb642b5fa2fe";
-  const char kShrunkMD5[] = "f4136cc9209207ab60eb8381a3df2e69";
-
+TEST_F(FPDFTransformEmbedderTest, TransFormWithClipAndSaveWithLocale) {
   pdfium::base::ScopedLocale scoped_locale("da_DK.UTF-8");
 
   {