From 120c19b6a19377c341658c342c4351eccbb59741 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 20 Nov 2017 22:23:50 +0000 Subject: Rename CXFA_MarginData methods This CL renames the CXFA_MarginData::Get*Inset methods to CXFA_MarginData::Try*Inset to match the fact that they may fail. The default value has been removed and all the callers correctly set the default values. Change-Id: Ib0dc8dc35807b60a0ddc0e5724604cb39845fcea Reviewed-on: https://pdfium-review.googlesource.com/18771 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/cxfa_fffield.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/cxfa_fffield.cpp') diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp index 7e36fea2cf..b4142ba701 100644 --- a/xfa/fxfa/cxfa_fffield.cpp +++ b/xfa/fxfa/cxfa_fffield.cpp @@ -172,11 +172,14 @@ void CXFA_FFField::CapPlacement() { CXFA_MarginData marginData = m_pDataAcc->GetMarginData(); if (marginData.HasValidNode()) { CXFA_LayoutItem* pItem = this; - float fLeftInset = 0, fRightInset = 0, fTopInset = 0, fBottomInset = 0; - marginData.GetLeftInset(fLeftInset); - marginData.GetRightInset(fRightInset); - marginData.GetTopInset(fTopInset); - marginData.GetBottomInset(fBottomInset); + float fLeftInset = 0; + float fRightInset = 0; + float fTopInset = 0; + float fBottomInset = 0; + marginData.TryLeftInset(fLeftInset); + marginData.TryRightInset(fRightInset); + marginData.TryTopInset(fTopInset); + marginData.TryBottomInset(fBottomInset); if (!pItem->GetPrev() && !pItem->GetNext()) { rtWidget.Deflate(fLeftInset, fTopInset, fRightInset, fBottomInset); } else { -- cgit v1.2.3