diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-12-13 18:29:02 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-13 18:29:02 +0000 |
| commit | 2614250d4f11ed02033a7da095a1694ece12ab78 (patch) | |
| tree | cc41c5770c17ea47537856991fa44cd1e2acfeb8 /xfa/fxfa/parser/cxfa_occurdata.cpp | |
| parent | 14768f3264a4cff8ca0096a27e41f1861b2c422b (diff) | |
| download | pdfium-2614250d4f11ed02033a7da095a1694ece12ab78.tar.xz | |
Methods are on CJX_Object not CJX_Node now
This CL converts all of the JSNode() to JSObject() calls as all of the
original CJX_Node methods have been moved to CJX_Object. This fixes
potential bad casts from things like CJX_Content which do not inhert
from CJX_Node.
Bug: pdfium:793372
Change-Id: I6c7f63a78f3d47bb6bad74faed3fd8c535bf095e
Reviewed-on: https://pdfium-review.googlesource.com/21090
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_occurdata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_occurdata.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xfa/fxfa/parser/cxfa_occurdata.cpp b/xfa/fxfa/parser/cxfa_occurdata.cpp index ffad9fdf00..195dce719a 100644 --- a/xfa/fxfa/parser/cxfa_occurdata.cpp +++ b/xfa/fxfa/parser/cxfa_occurdata.cpp @@ -15,7 +15,7 @@ int32_t CXFA_OccurData::GetMax() const { return 1; pdfium::Optional<int32_t> max = - m_pNode->JSNode()->TryInteger(XFA_Attribute::Max, true); + m_pNode->JSObject()->TryInteger(XFA_Attribute::Max, true); return max ? *max : GetMin(); } @@ -24,7 +24,7 @@ int32_t CXFA_OccurData::GetMin() const { return 1; pdfium::Optional<int32_t> min = - m_pNode->JSNode()->TryInteger(XFA_Attribute::Min, true); + m_pNode->JSObject()->TryInteger(XFA_Attribute::Min, true); return min && *min >= 0 ? *min : 1; } @@ -35,28 +35,28 @@ std::tuple<int32_t, int32_t, int32_t> CXFA_OccurData::GetOccurInfo() const { int32_t iMax = GetMax(); pdfium::Optional<int32_t> init = - m_pNode->JSNode()->TryInteger(XFA_Attribute::Initial, false); + m_pNode->JSObject()->TryInteger(XFA_Attribute::Initial, false); return {iMin, iMax, init && *init >= iMin ? *init : iMin}; } void CXFA_OccurData::SetMax(int32_t iMax) { iMax = (iMax != -1 && iMax < 1) ? 1 : iMax; - m_pNode->JSNode()->SetInteger(XFA_Attribute::Max, iMax, false); + m_pNode->JSObject()->SetInteger(XFA_Attribute::Max, iMax, false); int32_t iMin = GetMin(); if (iMax != -1 && iMax < iMin) { iMin = iMax; - m_pNode->JSNode()->SetInteger(XFA_Attribute::Min, iMin, false); + m_pNode->JSObject()->SetInteger(XFA_Attribute::Min, iMin, false); } } void CXFA_OccurData::SetMin(int32_t iMin) { iMin = (iMin < 0) ? 1 : iMin; - m_pNode->JSNode()->SetInteger(XFA_Attribute::Min, iMin, false); + m_pNode->JSObject()->SetInteger(XFA_Attribute::Min, iMin, false); int32_t iMax = GetMax(); if (iMax > 0 && iMax < iMin) { iMax = iMin; - m_pNode->JSNode()->SetInteger(XFA_Attribute::Max, iMax, false); + m_pNode->JSObject()->SetInteger(XFA_Attribute::Max, iMax, false); } } |