diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-21 16:36:40 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-21 16:36:40 +0000 |
| commit | 000b95b3c9dd7c7fbfbd6359404a09dfdc2d5226 (patch) | |
| tree | 9371de34885148dbdfaca46d12face201bf9c3ea /xfa/fxfa/parser/cxfa_datadata.cpp | |
| parent | 93446500616ad2c89d91b0ff75ff6d8d6dcc4427 (diff) | |
| download | pdfium-000b95b3c9dd7c7fbfbd6359404a09dfdc2d5226.tar.xz | |
Rename CXFA_DataData::TryMeasure
This CL renames CXFA_DataData::TryMeasure to TryMeasureAsFloat and
changes to return an Optional instead of a bool with an out-param.
Change-Id: I5adb75e3b8a2fb19330b33c90111f59f8c8cf722
Reviewed-on: https://pdfium-review.googlesource.com/18910
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_datadata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_datadata.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/xfa/fxfa/parser/cxfa_datadata.cpp b/xfa/fxfa/parser/cxfa_datadata.cpp index 28bb0a8b02..8429dd4e5e 100644 --- a/xfa/fxfa/parser/cxfa_datadata.cpp +++ b/xfa/fxfa/parser/cxfa_datadata.cpp @@ -69,14 +69,11 @@ XFA_Element CXFA_DataData::GetElementType() const { return m_pNode ? m_pNode->GetElementType() : XFA_Element::Unknown; } -bool CXFA_DataData::TryMeasure(XFA_Attribute eAttr, - float& fValue, - bool bUseDefault) const { +pdfium::Optional<float> CXFA_DataData::TryMeasureAsFloat( + XFA_Attribute attr) const { pdfium::Optional<CXFA_Measurement> measure = - m_pNode->JSNode()->TryMeasure(eAttr, bUseDefault); - if (!measure) - return false; - - fValue = measure->ToUnit(XFA_Unit::Pt); - return true; + m_pNode->JSNode()->TryMeasure(attr, false); + if (measure) + return {measure->ToUnit(XFA_Unit::Pt)}; + return {}; } |