diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-16 13:44:38 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-16 13:44:38 +0000 |
| commit | 0bf9aef229ae2c4f2f16ab753d6d2e9e6d718a44 (patch) | |
| tree | 2ed1f71183096853a7d552276047a67b473a9721 /xfa/fxfa/parser/cxfa_filldata.cpp | |
| parent | b066704a22ba4f242567f508c12bf2545cbed9e1 (diff) | |
| download | pdfium-0bf9aef229ae2c4f2f16ab753d6d2e9e6d718a44.tar.xz | |
Convert TryInteger to return an optional
This Cl changes CJX_Node::TryInteger to return a
pdfium::Optional<int32_t> instead of a boolean with an out param.
Change-Id: I4675e08d3b132041f7d87e4639efa1d555089dc2
Reviewed-on: https://pdfium-review.googlesource.com/18511
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_filldata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_filldata.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/xfa/fxfa/parser/cxfa_filldata.cpp b/xfa/fxfa/parser/cxfa_filldata.cpp index b55f24ad2a..4e1e5f1af2 100644 --- a/xfa/fxfa/parser/cxfa_filldata.cpp +++ b/xfa/fxfa/parser/cxfa_filldata.cpp @@ -72,15 +72,13 @@ int32_t CXFA_FillData::GetStipple(FX_ARGB& stippleColor) { CXFA_Node* pNode = m_pNode->JSNode()->GetProperty(0, XFA_Element::Stipple, true); - int32_t eAttr = 50; - pNode->JSNode()->TryInteger(XFA_Attribute::Rate, eAttr, true); if (CXFA_Node* pColor = pNode->GetChild(0, XFA_Element::Color, false)) { pdfium::Optional<WideString> wsColor = pColor->JSNode()->TryCData(XFA_Attribute::Value, false); if (wsColor) stippleColor = CXFA_DataData::ToColor(wsColor->AsStringView()); } - return eAttr; + return pNode->JSNode()->TryInteger(XFA_Attribute::Rate, true).value_or(50); } int32_t CXFA_FillData::GetLinear(FX_ARGB& endColor) { |