Rename CXFA_Validate methods for clarity

This CL updates GetScript to make clearer it can return nullptr.

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

4 files changed, 4 insertions, 4 deletions

diff --git a/xfa/fxfa/cxfa_ffwidgethandler.cpp b/xfa/fxfa/cxfa_ffwidgethandler.cpp
index 87cef5fae4..1c916c7bf3 100644
--- a/xfa/fxfa/cxfa_ffwidgethandler.cpp
+++ b/xfa/fxfa/cxfa_ffwidgethandler.cpp
@@ -199,7 +199,7 @@ bool CXFA_FFWidgetHandler::HasEvent(CXFA_WidgetAcc* pWidgetAcc,
     }
     case XFA_EVENT_Validate: {
       CXFA_Validate* validate = node->GetValidateIfExists();
-      return validate && validate->GetScript();
+      return validate && validate->GetScriptIfExists();
     }
     default:
       break;
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 3f0eb2bb34..a9c4a69dc6 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -1899,7 +1899,7 @@ int32_t CXFA_Node::ProcessValidate(CXFA_FFDocView* docView, int32_t iFlags) {
   bool bStatus = docView->GetLayoutStatus() < XFA_DOCVIEW_LAYOUTSTATUS_End;
   int32_t iFormat = 0;
   int32_t iRet = XFA_EVENTERROR_NotExist;
-  CXFA_Script* script = validate->GetScript();
+  CXFA_Script* script = validate->GetScriptIfExists();
   bool bRet = false;
   bool hasBoolResult = (bInitDoc || bStatus) && GetRawValue().IsEmpty();
   if (script) {
diff --git a/xfa/fxfa/parser/cxfa_validate.cpp b/xfa/fxfa/parser/cxfa_validate.cpp
index 9e7ffcee50..152fd97fa7 100644
--- a/xfa/fxfa/parser/cxfa_validate.cpp
+++ b/xfa/fxfa/parser/cxfa_validate.cpp
@@ -147,6 +147,6 @@ WideString CXFA_Validate::GetPicture() {
   return pNode ? pNode->JSObject()->GetContent(false) : L"";
 }
 
-CXFA_Script* CXFA_Validate::GetScript() {
+CXFA_Script* CXFA_Validate::GetScriptIfExists() {
   return GetChild<CXFA_Script>(0, XFA_Element::Script, false);
 }
diff --git a/xfa/fxfa/parser/cxfa_validate.h b/xfa/fxfa/parser/cxfa_validate.h
index df08ea6d3d..a6013080f1 100644
--- a/xfa/fxfa/parser/cxfa_validate.h
+++ b/xfa/fxfa/parser/cxfa_validate.h
@@ -31,7 +31,7 @@ class CXFA_Validate : public CXFA_Node {
   void SetScriptMessageText(const WideString& wsMessage);
 
   WideString GetPicture();
-  CXFA_Script* GetScript();
+  CXFA_Script* GetScriptIfExists();
 
  private:
   WideString GetMessageText(const WideString& wsMessageType);