diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-01 16:04:36 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-01 16:04:36 +0000 |
| commit | e5434b5531f2c081c1d69f67125b6665070ea969 (patch) | |
| tree | 1fa141f20597c62e9f2e2738d438bfaaecc772a3 /xfa/fxfa/parser/cxfa_occur.cpp | |
| parent | 3fff90a670d860a7b0319aa0edf8628917d0a122 (diff) | |
| download | pdfium-e5434b5531f2c081c1d69f67125b6665070ea969.tar.xz | |
Split JS code out of CXFA_Node.
This CL moves JS code out of CXFA_Node and places it into fxjs/cjx_node.
The CXFA_Node then has a CJX_Node as a member and, currently, proxies JS
calls to the CJX_Node member.
Change-Id: Ic5b95184c8fd2347f0bdcfbccfa89bb6b52835b6
Reviewed-on: https://pdfium-review.googlesource.com/17290
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_occur.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_occur.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/xfa/fxfa/parser/cxfa_occur.cpp b/xfa/fxfa/parser/cxfa_occur.cpp index ddce8d6422..6c770d2e72 100644 --- a/xfa/fxfa/parser/cxfa_occur.cpp +++ b/xfa/fxfa/parser/cxfa_occur.cpp @@ -13,7 +13,7 @@ CXFA_Occur::CXFA_Occur(CXFA_Node* pNode) : CXFA_Data(pNode) {} int32_t CXFA_Occur::GetMax() { int32_t iMax = 1; if (m_pNode) { - if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Max, iMax, true)) + if (!m_pNode->JSNode()->TryInteger(XFA_ATTRIBUTE_Max, iMax, true)) iMax = GetMin(); } return iMax; @@ -22,7 +22,8 @@ int32_t CXFA_Occur::GetMax() { int32_t CXFA_Occur::GetMin() { int32_t iMin = 1; if (m_pNode) { - if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Min, iMin, true) || iMin < 0) + if (!m_pNode->JSNode()->TryInteger(XFA_ATTRIBUTE_Min, iMin, true) || + iMin < 0) iMin = 1; } return iMin; @@ -31,15 +32,16 @@ int32_t CXFA_Occur::GetMin() { bool CXFA_Occur::GetOccurInfo(int32_t& iMin, int32_t& iMax, int32_t& iInit) { if (!m_pNode) return false; - if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Min, iMin, false) || iMin < 0) + if (!m_pNode->JSNode()->TryInteger(XFA_ATTRIBUTE_Min, iMin, false) || + iMin < 0) iMin = 1; - if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Max, iMax, false)) { + if (!m_pNode->JSNode()->TryInteger(XFA_ATTRIBUTE_Max, iMax, false)) { if (iMin == 0) iMax = 1; else iMax = iMin; } - if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Initial, iInit, false) || + if (!m_pNode->JSNode()->TryInteger(XFA_ATTRIBUTE_Initial, iInit, false) || iInit < iMin) { iInit = iMin; } @@ -48,20 +50,20 @@ bool CXFA_Occur::GetOccurInfo(int32_t& iMin, int32_t& iMax, int32_t& iInit) { void CXFA_Occur::SetMax(int32_t iMax) { iMax = (iMax != -1 && iMax < 1) ? 1 : iMax; - m_pNode->SetInteger(XFA_ATTRIBUTE_Max, iMax, false); + m_pNode->JSNode()->SetInteger(XFA_ATTRIBUTE_Max, iMax, false); int32_t iMin = GetMin(); if (iMax != -1 && iMax < iMin) { iMin = iMax; - m_pNode->SetInteger(XFA_ATTRIBUTE_Min, iMin, false); + m_pNode->JSNode()->SetInteger(XFA_ATTRIBUTE_Min, iMin, false); } } void CXFA_Occur::SetMin(int32_t iMin) { iMin = (iMin < 0) ? 1 : iMin; - m_pNode->SetInteger(XFA_ATTRIBUTE_Min, iMin, false); + m_pNode->JSNode()->SetInteger(XFA_ATTRIBUTE_Min, iMin, false); int32_t iMax = GetMax(); if (iMax > 0 && iMax < iMin) { iMax = iMin; - m_pNode->SetInteger(XFA_ATTRIBUTE_Max, iMax, false); + m_pNode->JSNode()->SetInteger(XFA_ATTRIBUTE_Max, iMax, false); } } |