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_captiondata.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_captiondata.cpp')
-rw-r--r-- | xfa/fxfa/parser/cxfa_captiondata.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fxfa/parser/cxfa_captiondata.cpp b/xfa/fxfa/parser/cxfa_captiondata.cpp index db7ca9d875..2045524dd6 100644 --- a/xfa/fxfa/parser/cxfa_captiondata.cpp +++ b/xfa/fxfa/parser/cxfa_captiondata.cpp @@ -24,9 +24,9 @@ int32_t CXFA_CaptionData::GetPlacementType() { } float CXFA_CaptionData::GetReserve() { - CXFA_Measurement ms; - m_pNode->JSNode()->TryMeasure(XFA_Attribute::Reserve, ms, true); - return ms.ToUnit(XFA_Unit::Pt); + return m_pNode->JSNode() + ->GetMeasure(XFA_Attribute::Reserve) + .ToUnit(XFA_Unit::Pt); } CXFA_MarginData CXFA_CaptionData::GetMarginData() { |