commit d2d4f96ac14dc541346f263e25cbe401f39a3581
author Hui Yingst <nigi@chromium.org> Thu Sep 10 20:50:38 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Sep 10 20:50:38 2020 +0000
tree 482fc877275bfe06f970dee50820ee9bf9d360fd
parent 95970ec2cbeadd51156bc0cdcd5070422bb25aa6

Fix CPDFSecurityHandlerEmbedderTest.PasswordAfterGenerateSave for Skia.

When rendering text with AGG,  CFX_RenderDevice::DrawNormalText() round
the value of each glyph's horizontal position into an integer depending
on the |anti_alias| mode. However Skia renders with the float value of
each glyph's horizontal position. This results in the discrepancies on
text rendering for embeddertest
CPDFSecurityHandlerEmbedderTest.PasswordAfterGenerateSave.

Since Skia's rendering result is acceptable, this CL adds the expected
checksum value for Skia so that this test can pass.

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

core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp

diff --git a/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp b/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
index 7bd4881..661fb45 100644
--- a/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
+++ b/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
@@ -134,20 +134,22 @@
   EXPECT_EQ(0xFFFFFFFC, FPDF_GetDocPermissions(document()));
 }
 
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
+TEST_F(CPDFSecurityHandlerEmbedderTest, PasswordAfterGenerateSave) {
 #if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#define MAYBE_PasswordAfterGenerateSave DISABLED_PasswordAfterGenerateSave
-#else
-#define MAYBE_PasswordAfterGenerateSave PasswordAfterGenerateSave
-#endif
-TEST_F(CPDFSecurityHandlerEmbedderTest, MAYBE_PasswordAfterGenerateSave) {
 #if defined(OS_WIN)
-  const char md5[] = "041c2fb541c8907cc22ce101b686c79e";
-#elif defined(OS_APPLE)
-  const char md5[] = "1ace03eb7c466c132aacf319cb9d69d3";
+  const char kChecksum[] = "06fe5a97341b3e0f0a22ccc242fd9040";
 #else
-  const char md5[] = "7048dca58e2ed8f93339008b91e4eb4e";
+  const char kChecksum[] = "169c8e3acea8fba5a40f695bbbc96273";
+#endif  // defined(OS_WIN)
+#else
+#if defined(OS_WIN)
+  const char kChecksum[] = "041c2fb541c8907cc22ce101b686c79e";
+#elif defined(OS_APPLE)
+  const char kChecksum[] = "1ace03eb7c466c132aacf319cb9d69d3";
+#else
+  const char kChecksum[] = "7048dca58e2ed8f93339008b91e4eb4e";
 #endif
+#endif  // defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
   {
     ASSERT_TRUE(OpenDocumentWithOptions("encrypted.pdf", "5678",
                                         LinearizeOption::kMustLinearize,
@@ -160,7 +162,7 @@
     EXPECT_TRUE(FPDFPath_SetDrawMode(red_rect, FPDF_FILLMODE_ALTERNATE, 0));
     FPDFPage_InsertObject(page, red_rect);
     ScopedFPDFBitmap bitmap = RenderLoadedPage(page);
-    CompareBitmap(bitmap.get(), 612, 792, md5);
+    CompareBitmap(bitmap.get(), 612, 792, kChecksum);
     EXPECT_TRUE(FPDFPage_GenerateContent(page));
     SetWholeFileAvailable();
     EXPECT_TRUE(FPDF_SaveAsCopy(document(), this, 0));
@@ -182,7 +184,7 @@
   for (const auto& test : tests) {
     ASSERT_TRUE(OpenSavedDocumentWithPassword(test.password));
     FPDF_PAGE page = LoadSavedPage(0);
-    VerifySavedRendering(page, 612, 792, md5);
+    VerifySavedRendering(page, 612, 792, kChecksum);
     EXPECT_EQ(test.permissions, FPDF_GetDocPermissions(saved_document_));
 
     CloseSavedPage(page);