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_widgetdata.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_widgetdata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_widgetdata.cpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index 5dd680ab8c..e87abd8ff7 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -237,11 +237,12 @@ int32_t CXFA_WidgetData::GetAccess() { } int32_t CXFA_WidgetData::GetRotate() { - CXFA_Measurement ms; - if (!m_pNode->JSNode()->TryMeasure(XFA_Attribute::Rotate, ms, false)) + pdfium::Optional<CXFA_Measurement> measure = + m_pNode->JSNode()->TryMeasure(XFA_Attribute::Rotate, false); + if (!measure) return 0; - int32_t iRotate = FXSYS_round(ms.GetValue()); + int32_t iRotate = FXSYS_round(measure->GetValue()); iRotate = XFA_MapRotation(iRotate); return iRotate / 90 * 90; } @@ -1206,23 +1207,23 @@ bool CXFA_WidgetData::GetBarcodeAttribute_ECLevel(int32_t* val) { } bool CXFA_WidgetData::GetBarcodeAttribute_ModuleWidth(int32_t* val) { - CXFA_Measurement mModuleWidthHeight; - if (GetUIChild()->JSNode()->TryMeasure(XFA_Attribute::ModuleWidth, - mModuleWidthHeight, true)) { - *val = static_cast<int32_t>(mModuleWidthHeight.ToUnit(XFA_Unit::Pt)); - return true; - } - return false; + pdfium::Optional<CXFA_Measurement> moduleWidthHeight = + GetUIChild()->JSNode()->TryMeasure(XFA_Attribute::ModuleWidth, true); + if (!moduleWidthHeight) + return false; + + *val = static_cast<int32_t>(moduleWidthHeight->ToUnit(XFA_Unit::Pt)); + return true; } bool CXFA_WidgetData::GetBarcodeAttribute_ModuleHeight(int32_t* val) { - CXFA_Measurement mModuleWidthHeight; - if (GetUIChild()->JSNode()->TryMeasure(XFA_Attribute::ModuleHeight, - mModuleWidthHeight, true)) { - *val = static_cast<int32_t>(mModuleWidthHeight.ToUnit(XFA_Unit::Pt)); - return true; - } - return false; + pdfium::Optional<CXFA_Measurement> moduleWidthHeight = + GetUIChild()->JSNode()->TryMeasure(XFA_Attribute::ModuleHeight, true); + if (!moduleWidthHeight) + return false; + + *val = static_cast<int32_t>(moduleWidthHeight->ToUnit(XFA_Unit::Pt)); + return true; } bool CXFA_WidgetData::GetBarcodeAttribute_PrintChecksum(bool* val) { |