commit f26b5f891b859525d6326525d5058a5b2683ddb2
author Hui Yingst <nigi@chromium.org> Tue Nov 17 05:26:03 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Nov 17 05:26:03 2020 +0000
tree 7e924feba358a9084cb29536340ad0e219ea4dbf
parent 9770285d5df2e32991f9b25b8af185665fbb9a93

Enable FPDFEditEmbedderTest.RemoveMarkedObjectsPrime for Skia/SkiaPaths.

Test FPDFEditEmbedderTest.RemoveMarkedObjectsPrime fails with Skia or
SkiaPathshttps enabled due to the same reasons as stated in
https://pdfium-review.googlesource.com/76030.

Since the Skia/SkiaPaths rendering result is acceptable, this CL adds
the expected results for Skia/SkiaPaths so that this test can pass.

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

fpdfsdk/fpdf_edit_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index 55a02f6..b7ff7ed 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -935,13 +935,7 @@
   UnloadPage(page);
 }
 
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_RemoveMarkedObjectsPrime DISABLED_RemoveMarkedObjectsPrime
-#else
-#define MAYBE_RemoveMarkedObjectsPrime RemoveMarkedObjectsPrime
-#endif
-TEST_F(FPDFEditEmbedderTest, MAYBE_RemoveMarkedObjectsPrime) {
+TEST_F(FPDFEditEmbedderTest, RemoveMarkedObjectsPrime) {
   // Load document with some text.
   ASSERT_TRUE(OpenDocument("text_in_page_marked.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -949,15 +943,23 @@
 
   // Show what the original file looks like.
   {
-#if defined(OS_APPLE)
-    const char kOriginalMD5[] = "adf815e53c788a5272b4df07c610a1da";
-#elif defined(OS_WIN)
-    const char kOriginalMD5[] = "00542ee435b37749c4453be63bf7bdb6";
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+    static constexpr char kOriginalChecksum[] =
+        "748ed321a485d246ca6260b9e30dd200";
 #else
-    const char kOriginalMD5[] = "41647268d5911d049801803b15c2dfb0";
+#if defined(OS_WIN)
+    static constexpr char kOriginalChecksum[] =
+        "00542ee435b37749c4453be63bf7bdb6";
+#elif defined(OS_APPLE)
+    static constexpr char kOriginalChecksum[] =
+        "adf815e53c788a5272b4df07c610a1da";
+#else
+    static constexpr char kOriginalChecksum[] =
+        "41647268d5911d049801803b15c2dfb0";
 #endif
+#endif  // defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
     ScopedFPDFBitmap page_bitmap = RenderPage(page);
-    CompareBitmap(page_bitmap.get(), 200, 200, kOriginalMD5);
+    CompareBitmap(page_bitmap.get(), 200, 200, kOriginalChecksum);
   }
 
   constexpr int expected_object_count = 19;
@@ -993,20 +995,32 @@
   }
 
   EXPECT_EQ(11, FPDFPage_CountObjects(page));
-
-#if defined(OS_APPLE)
-  const char kNonPrimesMD5[] = "d29e2ddff56e0d12f340794d26796400";
-  const char kNonPrimesAfterSaveMD5[] = "10eff2cd0037b661496981779601fa6f";
-#elif defined(OS_WIN)
-  const char kNonPrimesMD5[] = "86e371fdae30c2471f476631f3f93413";
-  const char kNonPrimesAfterSaveMD5[] = "86e371fdae30c2471f476631f3f93413";
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+  static constexpr char kNonPrimesChecksum[] =
+      "e2927fe2b7bbb595aca2a0e19ef3f1e8";
+  static constexpr char kNonPrimesAfterSaveChecksum[] =
+      "e2927fe2b7bbb595aca2a0e19ef3f1e8";
 #else
-  const char kNonPrimesMD5[] = "67ab13115d0cc34e99a1003c28047b40";
-  const char kNonPrimesAfterSaveMD5[] = "67ab13115d0cc34e99a1003c28047b40";
+#if defined(OS_WIN)
+  static constexpr char kNonPrimesChecksum[] =
+      "86e371fdae30c2471f476631f3f93413";
+  static constexpr char kNonPrimesAfterSaveChecksum[] =
+      "86e371fdae30c2471f476631f3f93413";
+#elif defined(OS_APPLE)
+  static constexpr char kNonPrimesChecksum[] =
+      "d29e2ddff56e0d12f340794d26796400";
+  static constexpr char kNonPrimesAfterSaveChecksum[] =
+      "10eff2cd0037b661496981779601fa6f";
+#else
+  static constexpr char kNonPrimesChecksum[] =
+      "67ab13115d0cc34e99a1003c28047b40";
+  static constexpr char kNonPrimesAfterSaveChecksum[] =
+      "67ab13115d0cc34e99a1003c28047b40";
 #endif
+#endif  // defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
   {
     ScopedFPDFBitmap page_bitmap = RenderPage(page);
-    CompareBitmap(page_bitmap.get(), 200, 200, kNonPrimesMD5);
+    CompareBitmap(page_bitmap.get(), 200, 200, kNonPrimesChecksum);
   }
 
   // Save the file.
@@ -1021,7 +1035,7 @@
 
   {
     ScopedFPDFBitmap page_bitmap = RenderPage(saved_page);
-    CompareBitmap(page_bitmap.get(), 200, 200, kNonPrimesAfterSaveMD5);
+    CompareBitmap(page_bitmap.get(), 200, 200, kNonPrimesAfterSaveChecksum);
   }
 
   CloseSavedPage(saved_page);