diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-16 14:19:47 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-16 14:19:47 +0000 |
| commit | ce7ccd5f638eff42c6c79da682061fa2c39b028f (patch) | |
| tree | c150e99f3c7ffb4e2d611e33aba743b43d718ac9 /xfa/fxfa/parser/cxfa_datadata.cpp | |
| parent | 8873a4dffed0ae3ccd961ada58c588f92b210bf2 (diff) | |
| download | pdfium-ce7ccd5f638eff42c6c79da682061fa2c39b028f.tar.xz | |
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 <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_datadata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_datadata.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xfa/fxfa/parser/cxfa_datadata.cpp b/xfa/fxfa/parser/cxfa_datadata.cpp index 8f41c2f3dd..cf813fc017 100644 --- a/xfa/fxfa/parser/cxfa_datadata.cpp +++ b/xfa/fxfa/parser/cxfa_datadata.cpp @@ -68,12 +68,13 @@ XFA_Element CXFA_DataData::GetElementType() const { bool CXFA_DataData::TryMeasure(XFA_Attribute eAttr, float& fValue, bool bUseDefault) const { - CXFA_Measurement ms; - if (m_pNode->JSNode()->TryMeasure(eAttr, ms, bUseDefault)) { - fValue = ms.ToUnit(XFA_Unit::Pt); - return true; - } - return false; + pdfium::Optional<CXFA_Measurement> measure = + m_pNode->JSNode()->TryMeasure(eAttr, bUseDefault); + if (!measure) + return false; + + fValue = measure->ToUnit(XFA_Unit::Pt); + return true; } bool CXFA_DataData::SetMeasure(XFA_Attribute eAttr, float fValue) { |