From ce7ccd5f638eff42c6c79da682061fa2c39b028f Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 16 Nov 2017 14:19:47 +0000 Subject: Convert CJX_Node::TryMeasure to pdfium::Optional This CL converts TryMeasure to return a pdfium::Optional instead of a bool with an out parameter. Change-Id: I6e92e53aa0eaa7a6b855253061acca8a59db49fd Reviewed-on: https://pdfium-review.googlesource.com/18550 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fxfa/parser/cxfa_paradata.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_paradata.cpp') diff --git a/xfa/fxfa/parser/cxfa_paradata.cpp b/xfa/fxfa/parser/cxfa_paradata.cpp index a04c195ba6..95dc80a934 100644 --- a/xfa/fxfa/parser/cxfa_paradata.cpp +++ b/xfa/fxfa/parser/cxfa_paradata.cpp @@ -24,37 +24,37 @@ int32_t CXFA_ParaData::GetVerticalAlign() { } float CXFA_ParaData::GetLineHeight() { - CXFA_Measurement ms; - m_pNode->JSNode()->TryMeasure(XFA_Attribute::LineHeight, ms, true); - return ms.ToUnit(XFA_Unit::Pt); + return m_pNode->JSNode() + ->GetMeasure(XFA_Attribute::LineHeight) + .ToUnit(XFA_Unit::Pt); } float CXFA_ParaData::GetMarginLeft() { - CXFA_Measurement ms; - m_pNode->JSNode()->TryMeasure(XFA_Attribute::MarginLeft, ms, true); - return ms.ToUnit(XFA_Unit::Pt); + return m_pNode->JSNode() + ->GetMeasure(XFA_Attribute::MarginLeft) + .ToUnit(XFA_Unit::Pt); } float CXFA_ParaData::GetMarginRight() { - CXFA_Measurement ms; - m_pNode->JSNode()->TryMeasure(XFA_Attribute::MarginRight, ms, true); - return ms.ToUnit(XFA_Unit::Pt); + return m_pNode->JSNode() + ->GetMeasure(XFA_Attribute::MarginRight) + .ToUnit(XFA_Unit::Pt); } float CXFA_ParaData::GetSpaceAbove() { - CXFA_Measurement ms; - m_pNode->JSNode()->TryMeasure(XFA_Attribute::SpaceAbove, ms, true); - return ms.ToUnit(XFA_Unit::Pt); + return m_pNode->JSNode() + ->GetMeasure(XFA_Attribute::SpaceAbove) + .ToUnit(XFA_Unit::Pt); } float CXFA_ParaData::GetSpaceBelow() { - CXFA_Measurement ms; - m_pNode->JSNode()->TryMeasure(XFA_Attribute::SpaceBelow, ms, true); - return ms.ToUnit(XFA_Unit::Pt); + return m_pNode->JSNode() + ->GetMeasure(XFA_Attribute::SpaceBelow) + .ToUnit(XFA_Unit::Pt); } float CXFA_ParaData::GetTextIndent() { - CXFA_Measurement ms; - m_pNode->JSNode()->TryMeasure(XFA_Attribute::TextIndent, ms, true); - return ms.ToUnit(XFA_Unit::Pt); + return m_pNode->JSNode() + ->GetMeasure(XFA_Attribute::TextIndent) + .ToUnit(XFA_Unit::Pt); } -- cgit v1.2.3