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, 7 insertions, 5 deletions

diff --git a/xfa/fxfa/cxfa_ffdocview.cpp b/xfa/fxfa/cxfa_ffdocview.cpp
index 5b1dc82223..25a357bc46 100644
--- a/xfa/fxfa/cxfa_ffdocview.cpp
+++ b/xfa/fxfa/cxfa_ffdocview.cpp
@@ -31,6 +31,7 @@
 #include "xfa/fxfa/cxfa_widgetacciterator.h"
 #include "xfa/fxfa/parser/cxfa_binditemsdata.h"
 #include "xfa/fxfa/parser/cxfa_layoutprocessor.h"
+#include "xfa/fxfa/parser/cxfa_validate.h"
 #include "xfa/fxfa/parser/xfa_resolvenode_rs.h"
 
 const XFA_AttributeEnum gs_EventActivity[] = {
@@ -221,11 +222,12 @@ bool CXFA_FFDocView::ResetSingleWidgetAccData(CXFA_WidgetAcc* pWidgetAcc) {
 
   pWidgetAcc->ResetData();
   pWidgetAcc->UpdateUIDisplay();
-  CXFA_ValidateData validateData = pWidgetAcc->GetValidateData(false);
-  if (validateData.HasValidNode()) {
-    AddValidateWidget(pWidgetAcc);
-    validateData.GetNode()->SetFlag(XFA_NodeFlag_NeedsInitApp, false);
-  }
+  CXFA_Validate* validate = pWidgetAcc->GetValidate(false);
+  if (!validate)
+    return true;
+
+  AddValidateWidget(pWidgetAcc);
+  validate->SetFlag(XFA_NodeFlag_NeedsInitApp, false);
   return true;
 }