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_document.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_document.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_document.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp index 8e0d25d3a4..e418c839c6 100644 --- a/xfa/fxfa/parser/cxfa_document.cpp +++ b/xfa/fxfa/parser/cxfa_document.cpp @@ -162,12 +162,12 @@ CXFA_Object* CXFA_Document::GetXFAObject(XFA_HashCode dwNodeNameHash) { continue; pdfium::Optional<WideString> namespaceURI = - pDatasetsChild->JSNode()->TryNamespace(); + pDatasetsChild->JSObject()->TryNamespace(); if (!namespaceURI) continue; pdfium::Optional<WideString> datasetsURI = - pDatasetsNode->JSNode()->TryNamespace(); + pDatasetsNode->JSObject()->TryNamespace(); if (!datasetsURI) continue; if (*namespaceURI == *datasetsURI) @@ -265,7 +265,7 @@ bool CXFA_Document::IsInteractive() { if (pFormFiller) { m_dwDocFlags |= XFA_DOCFLAG_HasInteractive; - WideString wsInteractive = pFormFiller->JSNode()->GetContent(false); + WideString wsInteractive = pFormFiller->JSObject()->GetContent(false); if (wsInteractive == L"1") { m_dwDocFlags |= XFA_DOCFLAG_Interactive; return true; @@ -331,7 +331,7 @@ CXFA_Node* CXFA_Document::GetNodeByID(CXFA_Node* pRoot, CXFA_NodeIterator sIterator(pRoot); for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode; pNode = sIterator.MoveToNext()) { - WideString wsIDVal = pNode->JSNode()->GetCData(XFA_Attribute::Id); + WideString wsIDVal = pNode->JSObject()->GetCData(XFA_Attribute::Id); if (!wsIDVal.IsEmpty() && wsIDVal == wsID) return pNode; } @@ -348,15 +348,15 @@ void CXFA_Document::DoProtoMerge() { CXFA_NodeIterator sIterator(pTemplateRoot); for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode; pNode = sIterator.MoveToNext()) { - WideString wsIDVal = pNode->JSNode()->GetCData(XFA_Attribute::Id); + WideString wsIDVal = pNode->JSObject()->GetCData(XFA_Attribute::Id); if (!wsIDVal.IsEmpty()) mIDMap[FX_HashCode_GetW(wsIDVal.AsStringView(), false)] = pNode; - WideString wsUseVal = pNode->JSNode()->GetCData(XFA_Attribute::Use); + WideString wsUseVal = pNode->JSObject()->GetCData(XFA_Attribute::Use); if (!wsUseVal.IsEmpty()) { sUseNodes.insert(pNode); } else { - wsUseVal = pNode->JSNode()->GetCData(XFA_Attribute::Usehref); + wsUseVal = pNode->JSObject()->GetCData(XFA_Attribute::Usehref); if (!wsUseVal.IsEmpty()) sUseNodes.insert(pNode); } @@ -368,7 +368,7 @@ void CXFA_Document::DoProtoMerge() { WideStringView wsSOM; WideString wsUseVal = - pUseHrefNode->JSNode()->GetCData(XFA_Attribute::Usehref); + pUseHrefNode->JSObject()->GetCData(XFA_Attribute::Usehref); if (!wsUseVal.IsEmpty()) { auto uSharpPos = wsUseVal.Find('#'); if (!uSharpPos.has_value()) { @@ -388,7 +388,7 @@ void CXFA_Document::DoProtoMerge() { } } } else { - wsUseVal = pUseHrefNode->JSNode()->GetCData(XFA_Attribute::Use); + wsUseVal = pUseHrefNode->JSObject()->GetCData(XFA_Attribute::Use); if (!wsUseVal.IsEmpty()) { if (wsUseVal[0] == '#') wsID = WideStringView(wsUseVal.c_str() + 1, wsUseVal.GetLength() - 1); |