commit 0d692fe5be9585e686fe5a5197f69f205ad83e3a
author Hui Yingst <nigi@chromium.org> Fri Nov 06 17:32:50 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Nov 06 17:32:50 2020 +0000
tree 2aa5f386901b76b613bb46b165bbfbd7020e997c
parent 2d45001fabebe2ad5fcfb7521b1b3ee94fa0ac01

Enable FPDFEditEmbedderTest.RemoveAllFromStream for Skia/SkiaPaths.

The Skia/SkiaPaths rendering result for
FPDFEditEmbedderTest.RemoveAllFromStream has small discrepancies
compared to AGG's expectation due to the following reasons:

- Skia uses different glyph loading method compared to AGG, and it
  changes for rendering text at different scales (See
  https://crbug.com/pdfium/1500#c7). The text rendering discrepancies
  between Skia and AGG decreases as the scale goes up.
- For text rendering, Skia uses regular anti-aliasing while AGG by
  default turn on LCD anti-aliasing, which will cause discrepancies
  along the edges of the text.

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

Bug: pdfium:1500
Change-Id: I9d9efd70b2663e35eb3d05bf9b20fb8f98200b51
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/76030
Reviewed-by: Daniel Hosseinian <dhoss@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 945982a..b7b4af1 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -1368,13 +1368,7 @@
   UnloadPage(page);
 }
 
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
-#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_RemoveAllFromStream DISABLED_RemoveAllFromStream
-#else
-#define MAYBE_RemoveAllFromStream RemoveAllFromStream
-#endif
-TEST_F(FPDFEditEmbedderTest, MAYBE_RemoveAllFromStream) {
+TEST_F(FPDFEditEmbedderTest, RemoveAllFromStream) {
   // Load document with some text split across streams.
   ASSERT_TRUE(OpenDocument("split_streams.pdf"));
   FPDF_PAGE page = LoadPage(0);
@@ -1432,16 +1426,20 @@
       EXPECT_EQ(1, cpdf_page_object->GetContentStream()) << i;
   }
 
-#if defined(OS_APPLE)
-  const char kStream1RemovedMD5[] = "0e8856ca9abc7049412e64f9230c7c43";
-#elif defined(OS_WIN)
-  const char kStream1RemovedMD5[] = "b4140f203523e38793283a5943d8075b";
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+  const char kStream1RemovedChecksum[] = "89358c444a398b0b56b35738edd8fe43";
 #else
-  const char kStream1RemovedMD5[] = "e86a3efc160ede6cfcb1f59bcacf1105";
+#if defined(OS_WIN)
+  const char kStream1RemovedChecksum[] = "b4140f203523e38793283a5943d8075b";
+#elif defined(OS_APPLE)
+  const char kStream1RemovedChecksum[] = "0e8856ca9abc7049412e64f9230c7c43";
+#else
+  const char kStream1RemovedChecksum[] = "e86a3efc160ede6cfcb1f59bcacf1105";
 #endif
+#endif  // defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
   {
     ScopedFPDFBitmap page_bitmap = RenderPage(page);
-    CompareBitmap(page_bitmap.get(), 200, 200, kStream1RemovedMD5);
+    CompareBitmap(page_bitmap.get(), 200, 200, kStream1RemovedChecksum);
   }
 
   // Save the file
@@ -1469,7 +1467,7 @@
 
   {
     ScopedFPDFBitmap page_bitmap = RenderPage(saved_page);
-    CompareBitmap(page_bitmap.get(), 200, 200, kStream1RemovedMD5);
+    CompareBitmap(page_bitmap.get(), 200, 200, kStream1RemovedChecksum);
   }
 
   CloseSavedPage(saved_page);