commit d021ad2f6306ae9d7b2ab5acf225c3bd8e957f8f
author Dan Sinclair <dsinclair@chromium.org> Tue Jan 16 15:46:46 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Jan 16 15:46:46 2018 +0000
tree b7acd3dbf3dd3916ffa2a85dd350af28c524437c
parent 54e4ccbbf09c496f8ab79a2b02fc4afc3d6abc42

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>

xfa/fxfa/cxfa_ffwidgethandler.cpp

diff --git a/xfa/fxfa/cxfa_ffwidgethandler.cpp b/xfa/fxfa/cxfa_ffwidgethandler.cpp
index 87cef5f..1c916c7 100644
--- a/xfa/fxfa/cxfa_ffwidgethandler.cpp
+++ b/xfa/fxfa/cxfa_ffwidgethandler.cpp
@@ -199,7 +199,7 @@
     }
     case XFA_EVENT_Validate: {
       CXFA_Validate* validate = node->GetValidateIfExists();
-      return validate && validate->GetScript();
+      return validate && validate->GetScriptIfExists();
     }
     default:
       break;

xfa/fxfa/parser/cxfa_node.cpp

diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 3f0eb2b..a9c4a69 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -1899,7 +1899,7 @@
   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) {

xfa/fxfa/parser/cxfa_validate.cpp

diff --git a/xfa/fxfa/parser/cxfa_validate.cpp b/xfa/fxfa/parser/cxfa_validate.cpp
index 9e7ffce..152fd97 100644
--- a/xfa/fxfa/parser/cxfa_validate.cpp
+++ b/xfa/fxfa/parser/cxfa_validate.cpp
@@ -147,6 +147,6 @@
   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);
 }

xfa/fxfa/parser/cxfa_validate.h

diff --git a/xfa/fxfa/parser/cxfa_validate.h b/xfa/fxfa/parser/cxfa_validate.h
index df08ea6..a601308 100644
--- a/xfa/fxfa/parser/cxfa_validate.h
+++ b/xfa/fxfa/parser/cxfa_validate.h
@@ -31,7 +31,7 @@
   void SetScriptMessageText(const WideString& wsMessage);
 
   WideString GetPicture();
-  CXFA_Script* GetScript();
+  CXFA_Script* GetScriptIfExists();
 
  private:
   WideString GetMessageText(const WideString& wsMessageType);