commit 4adc955605dccffd6add7cdbba182163ad1a09bb
author Hui Yingst <nigi@chromium.org> Mon Oct 17 20:38:52 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Oct 17 20:38:52 2022 +0000
tree 521776c308914cfaa3aefe623b7187b5e872f3ab
parent 336fae19c0e43ef8ea4903b839756559a54d1d8a

Enable 2 CFWLEditEmbedderTests

In CFWLEditEmbedderTest suite, update the Skia/SkiaPaths expectations
for ImageEditTest and ComboBoxTest, and enable these 2 tests since
their Skia/SkiaPaths rendering results (See [1]) are acceptable.

[1] https://bugs.chromium.org/p/pdfium/issues/detail?id=1500#c114

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

xfa/fwl/cfwl_edit_embeddertest.cpp

diff --git a/xfa/fwl/cfwl_edit_embeddertest.cpp b/xfa/fwl/cfwl_edit_embeddertest.cpp
index 0249ea9..12bbafa 100644
--- a/xfa/fwl/cfwl_edit_embeddertest.cpp
+++ b/xfa/fwl/cfwl_edit_embeddertest.cpp
@@ -251,36 +251,32 @@
 }
 
 TEST_F(CFWLEditEmbedderTest, ImageEditTest) {
-  // TODO(crbug.com/pdfium/11): Fix this test and enable for Skia variants.
-  if (CFX_DefaultRenderDevice::SkiaVariantIsDefaultRenderer())
-    return;
-
   CreateAndInitializeFormPDF("xfa/xfa_image_edit.pdf");
   FORM_OnLButtonDown(form_handle(), page(), 0, 115, 58);
-
-  const char kFilledMD5[] = "101cf6223fa2403fba4c413a8310ab02";
-  {
-    ScopedFPDFBitmap page_bitmap =
-        RenderLoadedPageWithFlags(page(), FPDF_ANNOT);
-    CompareBitmap(page_bitmap.get(), 612, 792, kFilledMD5);
-  }
+  const char* filled_checksum = []() {
+    if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+      return "062ad65614888e4f114b99f3396be3e8";
+    return "101cf6223fa2403fba4c413a8310ab02";
+  }();
+  ScopedFPDFBitmap page_bitmap = RenderLoadedPageWithFlags(page(), FPDF_ANNOT);
+  CompareBitmap(page_bitmap.get(), 612, 792, filled_checksum);
 }
 
 TEST_F(CFWLEditEmbedderTest, ComboBoxTest) {
-  // TODO(crbug.com/pdfium/11): Fix this test and enable for Skia variants.
-  if (CFX_DefaultRenderDevice::SkiaVariantIsDefaultRenderer())
-    return;
-
   CreateAndInitializeFormPDF("xfa/xfa_combobox.pdf");
 
   // Give focus to widget.
   FORM_OnLButtonDown(form_handle(), page(), 0, 115, 58);
   FORM_OnLButtonUp(form_handle(), page(), 0, 115, 58);
   {
+    const char* filled_checksum = []() {
+      if (CFX_DefaultRenderDevice::SkiaVariantIsDefaultRenderer())
+        return "8c555487e09ee4acf3ace77db5929bdc";
+      return "dad642ae8a5afce2591ffbcabbfc58dd";
+    }();
     ScopedFPDFBitmap page_bitmap =
         RenderLoadedPageWithFlags(page(), FPDF_ANNOT);
-    const char kFilledMD5[] = "dad642ae8a5afce2591ffbcabbfc58dd";
-    CompareBitmap(page_bitmap.get(), 612, 792, kFilledMD5);
+    CompareBitmap(page_bitmap.get(), 612, 792, filled_checksum);
   }
 
   // Click on down-arrow button, dropdown list appears.