From b800d149de09ac7d73aa3d1ff8558e33a4c56009 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 11 Jan 2018 16:29:42 +0000 Subject: Rename GetExclGroup to GetExclGroupIfExists This CL makes it clearer that GetExclGroup can return nullptr. Change-Id: Ica9bdfb05be36b3b6ede20f8b54daac1154506fd Reviewed-on: https://pdfium-review.googlesource.com/22739 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_node.cpp | 2 +- xfa/fxfa/parser/cxfa_node.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/fxfa/parser') diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 075ee46836..5d72cf7cb9 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -1654,7 +1654,7 @@ Optional CXFA_Node::TryMaxHeight() { return JSObject()->TryMeasureAsFloat(XFA_Attribute::MaxH); } -CXFA_Node* CXFA_Node::GetExclGroup() { +CXFA_Node* CXFA_Node::GetExclGroupIfExists() { CXFA_Node* pExcl = GetParent(); if (!pExcl || pExcl->GetElementType() != XFA_Element::ExclGroup) return nullptr; diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index 8108eeccc4..dec324300d 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -263,7 +263,7 @@ class CXFA_Node : public CXFA_Object { Optional TryMaxWidth(); Optional TryMaxHeight(); - CXFA_Node* GetExclGroup(); + CXFA_Node* GetExclGroupIfExists(); int32_t ProcessEvent(CXFA_FFDocView* docView, XFA_AttributeEnum iActivity, -- cgit v1.2.3