From 454eea606f8cd1ecdcd4816fa9d6600558287af0 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 11 Jan 2018 14:45:22 +0000 Subject: Rename GetBind to GetBindIfExists This CL updates the name to make it clearer the item an return nullptr. Change-Id: Icc5dbbf5ec3b9a8c73c6aaec585fdd61e2351c75 Reviewed-on: https://pdfium-review.googlesource.com/22710 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fxfa/cxfa_widgetacc.cpp | 2 +- xfa/fxfa/parser/cxfa_node.cpp | 2 +- xfa/fxfa/parser/cxfa_node.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp index d7fa3ccde9..5a925da833 100644 --- a/xfa/fxfa/cxfa_widgetacc.cpp +++ b/xfa/fxfa/cxfa_widgetacc.cpp @@ -2313,7 +2313,7 @@ WideString CXFA_WidgetAcc::GetPictureContent(XFA_VALUEPICTURE ePicture) { } } case XFA_VALUEPICTURE_DataBind: { - CXFA_Bind* bind = m_pNode->GetBind(); + CXFA_Bind* bind = m_pNode->GetBindIfExists(); if (bind) return bind->GetPicture(); break; diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 9c28668c16..2cf521f44b 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -1617,7 +1617,7 @@ CXFA_Validate* CXFA_Node::GetOrCreateValidateIfPossible() { XFA_Element::Validate); } -CXFA_Bind* CXFA_Node::GetBind() const { +CXFA_Bind* CXFA_Node::GetBindIfExists() const { return JSObject()->GetProperty(0, XFA_Element::Bind); } diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index 8a0a3610a6..f6021bd8b0 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -257,7 +257,7 @@ class CXFA_Node : public CXFA_Object { WideString GetRawValue(); int32_t GetRotate(); - CXFA_Bind* GetBind() const; + CXFA_Bind* GetBindIfExists() const; Optional TryWidth(); Optional TryHeight(); -- cgit v1.2.3