diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-04-10 13:01:07 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-10 13:01:07 +0000 |
| commit | 4027887ee29a7f4920b03041068bff9bde239782 (patch) | |
| tree | 5f3978ef04fbc8c3195cbadc3ed560c1712ab950 /xfa/fxfa/parser/cxfa_dataimporter.cpp | |
| parent | e372ad7333bdd6bb0c579cf074843ef0c6f3414f (diff) | |
| download | pdfium-4027887ee29a7f4920b03041068bff9bde239782.tar.xz | |
Merge CXFA_SimpleParser::{Start|Do}Parsechromium/3394
The StartParse and DoParse methods have been merged into a single Parse
method.
Change-Id: I1310bda90b853c11af8b8d1794de6b5c19e931cf
Reviewed-on: https://pdfium-review.googlesource.com/30010
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_dataimporter.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_dataimporter.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xfa/fxfa/parser/cxfa_dataimporter.cpp b/xfa/fxfa/parser/cxfa_dataimporter.cpp index c5c23fcfb9..01e95b1c3a 100644 --- a/xfa/fxfa/parser/cxfa_dataimporter.cpp +++ b/xfa/fxfa/parser/cxfa_dataimporter.cpp @@ -26,13 +26,12 @@ CXFA_DataImporter::~CXFA_DataImporter() {} bool CXFA_DataImporter::ImportData( const RetainPtr<IFX_SeekableStream>& pDataDocument) { - auto pDataDocumentParser = - pdfium::MakeUnique<CXFA_SimpleParser>(m_pDocument.Get()); - pDataDocumentParser->StartParse(pDataDocument, XFA_PacketType::Datasets); - if (pDataDocumentParser->DoParse() < XFA_PARSESTATUS_Done) + CXFA_SimpleParser parser(m_pDocument.Get()); + int status = parser.Parse(pDataDocument, XFA_PacketType::Datasets); + if (status < XFA_PARSESTATUS_Done) return false; - CXFA_Node* pImportDataRoot = pDataDocumentParser->GetRootNode(); + CXFA_Node* pImportDataRoot = parser.GetRootNode(); if (!pImportDataRoot) return false; |