Move XFA pixel tests under pixel/chromium/3358chromium/3357

This removes the need for them to have their own runner. Due to other
upstream changes some of the expectation files needed to be
updated. The suppressions have been updated to make sure the tests do
not run for non-XFA builds.

Having these tests run on the bots surfaced an MSAN issue in the XFA
code, which is fixed in this CL.

BUG=pdfium:1020,pdfium:1008

Change-Id: I44e2fa1cba2d07f30f56f5792749acbe1ebf4b62
Reviewed-on: https://pdfium-review.googlesource.com/27710
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>

27 files changed, 5 insertions, 20 deletions

diff --git a/testing/SUPPRESSIONS b/testing/SUPPRESSIONS
index ce852fd8ac..2572203384 100644
--- a/testing/SUPPRESSIONS
+++ b/testing/SUPPRESSIONS
@@ -322,13 +322,12 @@ bug_735912.in * * noxfa
 bug_492.in * nov8 *
 
 #
-# XFA Tests
-#
+# xfa_specific
+
 # TODO(rharrison): Create expectations for existing files.
 barcode_test.pdf * * *
 dynamic_list_box_allow_multiple_selection.pdf * * *
 dynamic_password_field_background_fill.pdf * * *
-email_recommended.pdf * * *
 resolve_nodes.pdf * * *
 standard_symbols.pdf * * *
 xfa_node_caption.pdf * * *
diff --git a/testing/resources/xfa/barcode_test.pdf b/testing/resources/pixel/xfa_specific/barcode_test.pdf
index 8454cd0752..8454cd0752 100644
--- a/testing/resources/xfa/barcode_test.pdf
+++ b/testing/resources/pixel/xfa_specific/barcode_test.pdf
diff --git a/testing/resources/xfa/dynamic_list_box_allow_multiple_selection.pdf b/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection.pdf
index 5c3aa79028..5c3aa79028 100644
--- a/testing/resources/xfa/dynamic_list_box_allow_multiple_selection.pdf
+++ b/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection.pdf
diff --git a/testing/resources/xfa/dynamic_password_field_background_fill.pdf b/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill.pdf
index f9d74cd6ad..f9d74cd6ad 100644
--- a/testing/resources/xfa/dynamic_password_field_background_fill.pdf
+++ b/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill.pdf
diff --git a/testing/resources/xfa/dynamic_table_color_and_width.pdf b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width.pdf
index 7b59c1825e..7b59c1825e 100644
--- a/testing/resources/xfa/dynamic_table_color_and_width.pdf
+++ b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width.pdf
diff --git a/testing/resources/xfa/dynamic_table_color_and_width_expected.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected.pdf.0.png
index 6b2203150a..6b2203150a 100644
--- a/testing/resources/xfa/dynamic_table_color_and_width_expected.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected.pdf.0.png
diff --git a/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_win.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_win.pdf.0.png
new file mode 100644
index 0000000000..fc31cfaf2b
--- /dev/null
+++ b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_win.pdf.0.png
diff --git a/testing/resources/xfa/resolve_nodes.pdf b/testing/resources/pixel/xfa_specific/resolve_nodes.pdf
index 9694f7fe50..9694f7fe50 100644
--- a/testing/resources/xfa/resolve_nodes.pdf
+++ b/testing/resources/pixel/xfa_specific/resolve_nodes.pdf
diff --git a/testing/resources/xfa/standard_symbols.pdf b/testing/resources/pixel/xfa_specific/standard_symbols.pdf
index 6a06520f34..6a06520f34 100644
--- a/testing/resources/xfa/standard_symbols.pdf
+++ b/testing/resources/pixel/xfa_specific/standard_symbols.pdf
diff --git a/testing/resources/xfa/static_list_box_caption.pdf b/testing/resources/pixel/xfa_specific/static_list_box_caption.pdf
index 5b166cd214..5b166cd214 100644
--- a/testing/resources/xfa/static_list_box_caption.pdf
+++ b/testing/resources/pixel/xfa_specific/static_list_box_caption.pdf
diff --git a/testing/resources/pixel/xfa_specific/static_list_box_caption_expected.pdf.0.png b/testing/resources/pixel/xfa_specific/static_list_box_caption_expected.pdf.0.png
new file mode 100644
index 0000000000..45a898326f
--- /dev/null
+++ b/testing/resources/pixel/xfa_specific/static_list_box_caption_expected.pdf.0.png
diff --git a/testing/resources/xfa/static_list_box_caption_expected.pdf.0.png b/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_mac.pdf.0.png
index 677ba280a4..677ba280a4 100644
--- a/testing/resources/xfa/static_list_box_caption_expected.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_mac.pdf.0.png
diff --git a/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_win.pdf.0.png b/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_win.pdf.0.png
new file mode 100644
index 0000000000..71edafd0a9
--- /dev/null
+++ b/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_win.pdf.0.png
diff --git a/testing/resources/xfa/static_password_field_rotate.pdf b/testing/resources/pixel/xfa_specific/static_password_field_rotate.pdf
index 1ea45b68cc..1ea45b68cc 100644
--- a/testing/resources/xfa/static_password_field_rotate.pdf
+++ b/testing/resources/pixel/xfa_specific/static_password_field_rotate.pdf
diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.0.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.0.png
new file mode 100644
index 0000000000..d49fc369bf
--- /dev/null
+++ b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.0.png
diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.1.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.1.png
new file mode 100644
index 0000000000..3e60b4d893
--- /dev/null
+++ b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected.pdf.1.png
diff --git a/testing/resources/xfa/static_password_field_rotate_expected.pdf.0.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_mac.pdf.0.png
index 79f2e3fd0a..79f2e3fd0a 100644
--- a/testing/resources/xfa/static_password_field_rotate_expected.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_mac.pdf.0.png
diff --git a/testing/resources/xfa/static_password_field_rotate_expected.pdf.1.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_mac.pdf.1.png
index 1d99751a65..1d99751a65 100644
--- a/testing/resources/xfa/static_password_field_rotate_expected.pdf.1.png
+++ b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_mac.pdf.1.png
diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.0.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.0.png
new file mode 100644
index 0000000000..9530509f61
--- /dev/null
+++ b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.0.png
diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.1.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.1.png
new file mode 100644
index 0000000000..3e60b4d893
--- /dev/null
+++ b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.1.png
diff --git a/testing/resources/xfa/xfa_example.in b/testing/resources/pixel/xfa_specific/xfa_example.in
index d8be96f305..d8be96f305 100644
--- a/testing/resources/xfa/xfa_example.in
+++ b/testing/resources/pixel/xfa_specific/xfa_example.in
diff --git a/testing/resources/pixel/xfa_specific/xfa_example_expected.pdf.0.png b/testing/resources/pixel/xfa_specific/xfa_example_expected.pdf.0.png
new file mode 100644
index 0000000000..81c317a1e7
--- /dev/null
+++ b/testing/resources/pixel/xfa_specific/xfa_example_expected.pdf.0.png
diff --git a/testing/resources/xfa/xfa_example_expected.pdf.0.png b/testing/resources/pixel/xfa_specific/xfa_example_expected_mac.pdf.0.png
index 9a682f7186..9a682f7186 100644
--- a/testing/resources/xfa/xfa_example_expected.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/xfa_example_expected_mac.pdf.0.png
diff --git a/testing/resources/pixel/xfa_specific/xfa_example_expected_win.pdf.0.png b/testing/resources/pixel/xfa_specific/xfa_example_expected_win.pdf.0.png
new file mode 100644
index 0000000000..9a682f7186
--- /dev/null
+++ b/testing/resources/pixel/xfa_specific/xfa_example_expected_win.pdf.0.png
diff --git a/testing/resources/xfa/xfa_node_caption.pdf b/testing/resources/pixel/xfa_specific/xfa_node_caption.pdf
index ef8eb7dcc9..ef8eb7dcc9 100644
--- a/testing/resources/xfa/xfa_node_caption.pdf
+++ b/testing/resources/pixel/xfa_specific/xfa_node_caption.pdf
diff --git a/testing/tools/run_xfa_tests.py b/testing/tools/run_xfa_tests.py
deleted file mode 100755
index 6647cfd939..0000000000
--- a/testing/tools/run_xfa_tests.py
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2018 The PDFium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import sys
-
-import test_runner
-
-def main():
-  runner = test_runner.TestRunner('xfa')
-  runner.SetEnforceExpectedImages(True)
-  return runner.Run()
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/xfa/fxfa/cxfa_textparser.cpp b/xfa/fxfa/cxfa_textparser.cpp
index bcadbea5c0..a957147762 100644
--- a/xfa/fxfa/cxfa_textparser.cpp
+++ b/xfa/fxfa/cxfa_textparser.cpp
@@ -434,9 +434,11 @@ void CXFA_TextParser::GetUnderline(CXFA_TextProvider* pTextProvider,
 void CXFA_TextParser::GetLinethrough(CXFA_TextProvider* pTextProvider,
                                      CFX_CSSComputedStyle* pStyle,
                                      int32_t& iLinethrough) const {
+  iLinethrough = 0;
   if (pStyle) {
     uint32_t dwDecoration = pStyle->GetTextDecoration();
-    iLinethrough = (dwDecoration & CFX_CSSTEXTDECORATION_LineThrough) ? 1 : 0;
+    if (dwDecoration & CFX_CSSTEXTDECORATION_LineThrough)
+      iLinethrough = 1;
     return;
   }