diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-16 14:17:17 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-16 14:17:17 +0000 |
commit | 9d608ff14177cd665f6b2ead639415bda935fbe2 (patch) | |
tree | d538fbf435ed55cf07ff37c24bc835507c12466d /xfa/fxfa/cxfa_ffpageview.cpp | |
parent | 9d47de6b27b167db46b6aba38352fc42a8b6adae (diff) | |
download | pdfium-9d608ff14177cd665f6b2ead639415bda935fbe2.tar.xz |
Cleanup CJX_Node::GetAttribute
This CL renames GetAttribute to TryAttribute and changes to return a
pdfium::Optional instead of a boolean with an out parameter.
GetAttribute is then added to call TryAttribute to mirror the other
methods in the file.
Change-Id: I875dac120776af7c53fe069e4dd36e5486838447
Reviewed-on: https://pdfium-review.googlesource.com/18514
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffpageview.cpp')
-rw-r--r-- | xfa/fxfa/cxfa_ffpageview.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_ffpageview.cpp b/xfa/fxfa/cxfa_ffpageview.cpp index 3c88a121da..26bdc26acd 100644 --- a/xfa/fxfa/cxfa_ffpageview.cpp +++ b/xfa/fxfa/cxfa_ffpageview.cpp @@ -314,11 +314,10 @@ CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::GetTraverseWidget( CXFA_Node* pTraverse = pTraversal->GetChild(0, XFA_Element::Traverse, false); if (pTraverse) { - WideString wsTraverseWidgetName; - if (pTraverse->JSNode()->GetAttribute(XFA_Attribute::Ref, - wsTraverseWidgetName, true)) { - return FindWidgetByName(wsTraverseWidgetName, pWidget); - } + pdfium::Optional<WideString> traverseWidgetName = + pTraverse->JSNode()->TryAttribute(XFA_Attribute::Ref, true); + if (traverseWidgetName) + return FindWidgetByName(*traverseWidgetName, pWidget); } } return nullptr; |