From 8b68d30fdc8ae33a8a5c2d647bd7a67f1271ff90 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Thu, 11 Jan 2018 14:19:51 +0000
Subject: Rename Getvalidate and GetOrCreateValidate

This CL renames the validation methods to make it clear they can return
nullptr.

Change-Id: I60d0c41cdfe9902049d99cd790f851517b11a6d9
Reviewed-on: https://pdfium-review.googlesource.com/22682
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
---
 xfa/fxfa/cxfa_ffdocview.cpp       | 2 +-
 xfa/fxfa/cxfa_ffwidgethandler.cpp | 2 +-
 xfa/fxfa/parser/cxfa_node.cpp     | 6 +++---
 xfa/fxfa/parser/cxfa_node.h       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'xfa')

diff --git a/xfa/fxfa/cxfa_ffdocview.cpp b/xfa/fxfa/cxfa_ffdocview.cpp
index 94931bda33..31996315df 100644
--- a/xfa/fxfa/cxfa_ffdocview.cpp
+++ b/xfa/fxfa/cxfa_ffdocview.cpp
@@ -228,7 +228,7 @@ bool CXFA_FFDocView::ResetSingleWidgetAccData(CXFA_WidgetAcc* pWidgetAcc) {
 
   pWidgetAcc->ResetData();
   pWidgetAcc->UpdateUIDisplay(this, nullptr);
-  CXFA_Validate* validate = pNode->GetValidate();
+  CXFA_Validate* validate = pNode->GetValidateIfExists();
   if (!validate)
     return true;
 
diff --git a/xfa/fxfa/cxfa_ffwidgethandler.cpp b/xfa/fxfa/cxfa_ffwidgethandler.cpp
index 3a9ff9a316..d4ead07ba9 100644
--- a/xfa/fxfa/cxfa_ffwidgethandler.cpp
+++ b/xfa/fxfa/cxfa_ffwidgethandler.cpp
@@ -198,7 +198,7 @@ bool CXFA_FFWidgetHandler::HasEvent(CXFA_WidgetAcc* pWidgetAcc,
       return calc && calc->GetScript();
     }
     case XFA_EVENT_Validate: {
-      CXFA_Validate* validate = node->GetValidate();
+      CXFA_Validate* validate = node->GetValidateIfExists();
       return validate && validate->GetScript();
     }
     default:
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 74263c7643..5a08d16986 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -1608,11 +1608,11 @@ CXFA_Calculate* CXFA_Node::GetCalculateIfExists() const {
   return JSObject()->GetProperty<CXFA_Calculate>(0, XFA_Element::Calculate);
 }
 
-CXFA_Validate* CXFA_Node::GetValidate() const {
+CXFA_Validate* CXFA_Node::GetValidateIfExists() const {
   return JSObject()->GetProperty<CXFA_Validate>(0, XFA_Element::Validate);
 }
 
-CXFA_Validate* CXFA_Node::GetOrCreateValidate() {
+CXFA_Validate* CXFA_Node::GetOrCreateValidateIfPossible() {
   return JSObject()->GetOrCreateProperty<CXFA_Validate>(0,
                                                         XFA_Element::Validate);
 }
@@ -1878,7 +1878,7 @@ int32_t CXFA_Node::ProcessValidate(CXFA_FFDocView* docView, int32_t iFlags) {
   if (GetElementType() == XFA_Element::Draw)
     return XFA_EVENTERROR_NotExist;
 
-  CXFA_Validate* validate = GetValidate();
+  CXFA_Validate* validate = GetValidateIfExists();
   if (!validate)
     return XFA_EVENTERROR_NotExist;
 
diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h
index cafe6676fd..543d895aeb 100644
--- a/xfa/fxfa/parser/cxfa_node.h
+++ b/xfa/fxfa/parser/cxfa_node.h
@@ -249,8 +249,8 @@ class CXFA_Node : public CXFA_Object {
   CXFA_Margin* GetMarginIfExists() const;
   CXFA_Para* GetParaIfExists() const;
   CXFA_Calculate* GetCalculateIfExists() const;
-  CXFA_Validate* GetValidate() const;
-  CXFA_Validate* GetOrCreateValidate();
+  CXFA_Validate* GetValidateIfExists() const;
+  CXFA_Validate* GetOrCreateValidateIfPossible();
 
   CXFA_Value* GetDefaultValue();
   CXFA_Value* GetFormValue() const;
-- 
cgit v1.2.3