Fold CXFA_ValidateData into CXFA_Validate

The ValidateData class is a thin wrapper around the Validate class. Now
that the Validate class exists we can fold the methods from ValidateData
into Validate.

Change-Id: I1e72f4b7bddeb22a311f4fe9a5940204221b6d2a
Reviewed-on: https://pdfium-review.googlesource.com/21150
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

1 files changed, 22 insertions, 0 deletions

diff --git a/xfa/fxfa/parser/cxfa_validate.h b/xfa/fxfa/parser/cxfa_validate.h
index d19850cd77..9e2be9c959 100644
--- a/xfa/fxfa/parser/cxfa_validate.h
+++ b/xfa/fxfa/parser/cxfa_validate.h
@@ -13,6 +13,28 @@ class CXFA_Validate : public CXFA_Node {
  public:
   CXFA_Validate(CXFA_Document* doc, XFA_PacketType packet);
   ~CXFA_Validate() override;
+
+  XFA_AttributeEnum GetFormatTest();
+  WideString GetFormatMessageText();
+  void SetFormatMessageText(const WideString& wsMessage);
+
+  XFA_AttributeEnum GetNullTest();
+  void SetNullTest(const WideString& wsValue);
+
+  WideString GetNullMessageText();
+  void SetNullMessageText(const WideString& wsMessage);
+
+  XFA_AttributeEnum GetScriptTest();
+  WideString GetScriptMessageText();
+  void SetScriptMessageText(const WideString& wsMessage);
+
+  WideString GetPicture();
+  CXFA_ScriptData GetScriptData();
+
+ private:
+  WideString GetMessageText(const WideString& wsMessageType);
+  void SetMessageText(const WideString& wsMessageType,
+                      const WideString& wsMessage);
 };
 
 #endif  // XFA_FXFA_PARSER_CXFA_VALIDATE_H_