diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-08-17 01:24:17 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-17 01:24:17 +0000 |
| commit | 42f5bf0c37f2f686c9b172fb3d9f284744b74be3 (patch) | |
| tree | c84cb249f2d1c7f5d0e02ed9f8b16d1e68365bae | |
| parent | 9faabc5fc37171d9411dc2eb7f7eab4d444066a0 (diff) | |
| download | pdfium-42f5bf0c37f2f686c9b172fb3d9f284744b74be3.tar.xz | |
Remove optionals from CXFA_NodeHelper::NodeAcc_TraverseSiblings().
Change-Id: I0a20734c0ad3f6bbc83a85a53f09b5e8ccdfa548
Reviewed-on: https://pdfium-review.googlesource.com/40450
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
| -rw-r--r-- | xfa/fxfa/parser/cxfa_nodehelper.cpp | 6 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_nodehelper.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fxfa/parser/cxfa_nodehelper.cpp b/xfa/fxfa/parser/cxfa_nodehelper.cpp index 7f2e72a289..142b18ac0d 100644 --- a/xfa/fxfa/parser/cxfa_nodehelper.cpp +++ b/xfa/fxfa/parser/cxfa_nodehelper.cpp @@ -50,10 +50,10 @@ int32_t CXFA_NodeHelper::CountSiblings(CXFA_Node* pNode, } if (bIsClassName) { return NodeAcc_TraverseSiblings(parent, pNode->GetClassHashCode(), - pSiblings, eLogicType, bIsClassName); + pSiblings, eLogicType, bIsClassName, true); } return NodeAcc_TraverseSiblings(parent, pNode->GetNameHash(), pSiblings, - eLogicType, bIsClassName); + eLogicType, bIsClassName, true); } int32_t CXFA_NodeHelper::NodeAcc_TraverseAnySiblings( @@ -217,7 +217,7 @@ int32_t CXFA_NodeHelper::GetIndex(CXFA_Node* pNode, } std::vector<CXFA_Node*> siblings; int32_t iSize = NodeAcc_TraverseSiblings(parent, dwHashName, &siblings, - eLogicType, bIsClassIndex); + eLogicType, bIsClassIndex, true); for (int32_t i = 0; i < iSize; ++i) { CXFA_Node* child = siblings[i]; if (child == pNode) { diff --git a/xfa/fxfa/parser/cxfa_nodehelper.h b/xfa/fxfa/parser/cxfa_nodehelper.h index ccf60ac3d6..e2b367d0f3 100644 --- a/xfa/fxfa/parser/cxfa_nodehelper.h +++ b/xfa/fxfa/parser/cxfa_nodehelper.h @@ -33,8 +33,8 @@ class CXFA_NodeHelper { uint32_t dNameHash, std::vector<CXFA_Node*>* pSiblings, XFA_LOGIC_TYPE eLogicType, - bool bIsClassName = false, - bool bIsFindProperty = true); + bool bIsClassName, + bool bIsFindProperty); int32_t NodeAcc_TraverseAnySiblings(CXFA_Node* parent, uint32_t dNameHash, std::vector<CXFA_Node*>* pSiblings, |