diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-04-05 16:33:44 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-05 20:36:33 +0000 |
| commit | 5f983bb6aeae696ec5577a66771ef19cc3140b49 (patch) | |
| tree | 2e0ec281852feb3c8aba93498a80e7c5adcaa886 /xfa/fde/xml/cfde_xmlparser.cpp | |
| parent | 3198c681df875f7f268f03040b64343741d4bda1 (diff) | |
| download | pdfium-5f983bb6aeae696ec5577a66771ef19cc3140b49.tar.xz | |
Update XML syntax parser to return strings
This Cl updates the CFDE_XMLSyntaxParser to return strings instead of
taking out parameters.
Change-Id: I51124d8d961c00a72987c1a21025d0626b965fab
Reviewed-on: https://pdfium-review.googlesource.com/3754
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fde/xml/cfde_xmlparser.cpp')
| -rw-r--r-- | xfa/fde/xml/cfde_xmlparser.cpp | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/xfa/fde/xml/cfde_xmlparser.cpp b/xfa/fde/xml/cfde_xmlparser.cpp index ad7b9e1a6f..f4d2a0f113 100644 --- a/xfa/fde/xml/cfde_xmlparser.cpp +++ b/xfa/fde/xml/cfde_xmlparser.cpp @@ -26,7 +26,7 @@ CFDE_XMLParser::CFDE_XMLParser(CFDE_XMLNode* pParent, m_syntaxParserResult(FDE_XmlSyntaxResult::None) { ASSERT(m_pParent && m_pStream); m_NodeStack.push(m_pParent); - m_pParser->Init(m_pStream, 32 * 1024, 1024 * 1024); + m_pParser->Init(m_pStream, 32 * 1024); } CFDE_XMLParser::~CFDE_XMLParser() {} @@ -63,7 +63,7 @@ int32_t CFDE_XMLParser::DoParser(IFX_Pause* pPause) { m_syntaxParserResult = FDE_XmlSyntaxResult::Error; break; } - m_pParser->GetTagName(m_ws1); + m_ws1 = m_pParser->GetTagName(); m_ws2 = static_cast<CFDE_XMLElement*>(m_pChild)->GetName(); if (m_ws1.GetLength() > 0 && m_ws1 != m_ws2) { m_syntaxParserResult = FDE_XmlSyntaxResult::Error; @@ -85,7 +85,7 @@ int32_t CFDE_XMLParser::DoParser(IFX_Pause* pPause) { iCount++; break; case FDE_XmlSyntaxResult::TargetName: - m_pParser->GetTargetName(m_ws1); + m_ws1 = m_pParser->GetTargetName(); if (m_ws1 == L"originalXFAVersion" || m_ws1 == L"acrobat") { m_pChild = new CFDE_XMLInstruction(m_ws1); m_pParent->InsertChildNode(m_pChild); @@ -95,7 +95,7 @@ int32_t CFDE_XMLParser::DoParser(IFX_Pause* pPause) { m_ws1.clear(); break; case FDE_XmlSyntaxResult::TagName: - m_pParser->GetTagName(m_ws1); + m_ws1 = m_pParser->GetTagName(); m_pChild = new CFDE_XMLElement(m_ws1); m_pParent->InsertChildNode(m_pChild); m_NodeStack.push(m_pChild); @@ -118,25 +118,24 @@ int32_t CFDE_XMLParser::DoParser(IFX_Pause* pPause) { } break; case FDE_XmlSyntaxResult::AttriName: - m_pParser->GetAttributeName(m_ws1); + m_ws1 = m_pParser->GetAttributeName(); break; case FDE_XmlSyntaxResult::AttriValue: if (m_pChild) { - m_pParser->GetAttributeName(m_ws2); - if (m_pChild->GetType() == FDE_XMLNODE_Element) { + m_ws2 = m_pParser->GetAttributeName(); + if (m_pChild->GetType() == FDE_XMLNODE_Element) static_cast<CFDE_XMLElement*>(m_pChild)->SetString(m_ws1, m_ws2); - } } m_ws1.clear(); break; case FDE_XmlSyntaxResult::Text: - m_pParser->GetTextData(m_ws1); + m_ws1 = m_pParser->GetTextData(); m_pChild = new CFDE_XMLText(m_ws1); m_pParent->InsertChildNode(m_pChild); m_pChild = m_pParent; break; case FDE_XmlSyntaxResult::CData: - m_pParser->GetTextData(m_ws1); + m_ws1 = m_pParser->GetTextData(); m_pChild = new CFDE_XMLCharData(m_ws1); m_pParent->InsertChildNode(m_pChild); m_pChild = m_pParent; @@ -147,11 +146,10 @@ int32_t CFDE_XMLParser::DoParser(IFX_Pause* pPause) { m_syntaxParserResult = FDE_XmlSyntaxResult::Error; break; } - if (!m_ws1.IsEmpty()) { - static_cast<CFDE_XMLInstruction*>(m_pChild)->AppendData(m_ws1); - } - m_pParser->GetTargetData(m_ws1); - static_cast<CFDE_XMLInstruction*>(m_pChild)->AppendData(m_ws1); + auto* instruction = static_cast<CFDE_XMLInstruction*>(m_pChild); + if (!m_ws1.IsEmpty()) + instruction->AppendData(m_ws1); + instruction->AppendData(m_pParser->GetTargetData()); } m_ws1.clear(); break; |