Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Side by Side Diff: xfa/fxfa/parser/cxfa_dataimporter.cpp

Issue 2451493002: Refcount all the IFX_ stream classes all the time. (Closed)
Patch Set: Clean up cast expression Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « xfa/fxfa/parser/cxfa_dataimporter.h ('k') | xfa/fxfa/parser/cxfa_document_parser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 PDFium Authors. All rights reserved. 1 // Copyright 2016 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "xfa/fxfa/parser/cxfa_dataimporter.h" 7 #include "xfa/fxfa/parser/cxfa_dataimporter.h"
8 8
9 #include <memory> 9 #include <memory>
10 10
11 #include "core/fxcrt/fx_stream.h" 11 #include "core/fxcrt/fx_stream.h"
12 #include "third_party/base/ptr_util.h"
12 #include "xfa/fde/xml/fde_xml_imp.h" 13 #include "xfa/fde/xml/fde_xml_imp.h"
13 #include "xfa/fxfa/fxfa.h" 14 #include "xfa/fxfa/fxfa.h"
14 #include "xfa/fxfa/fxfa_basic.h" 15 #include "xfa/fxfa/fxfa_basic.h"
15 #include "xfa/fxfa/parser/cxfa_document.h" 16 #include "xfa/fxfa/parser/cxfa_document.h"
16 #include "xfa/fxfa/parser/cxfa_simple_parser.h" 17 #include "xfa/fxfa/parser/cxfa_simple_parser.h"
17 #include "xfa/fxfa/parser/xfa_object.h" 18 #include "xfa/fxfa/parser/xfa_object.h"
18 19
19 CXFA_DataImporter::CXFA_DataImporter(CXFA_Document* pDocument) 20 CXFA_DataImporter::CXFA_DataImporter(CXFA_Document* pDocument)
20 : m_pDocument(pDocument) { 21 : m_pDocument(pDocument) {
21 ASSERT(m_pDocument); 22 ASSERT(m_pDocument);
22 } 23 }
23 24
24 bool CXFA_DataImporter::ImportData(IFX_SeekableReadStream* pDataDocument) { 25 bool CXFA_DataImporter::ImportData(
25 std::unique_ptr<CXFA_SimpleParser> pDataDocumentParser( 26 const CFX_RetainPtr<IFX_SeekableReadStream>& pDataDocument) {
26 new CXFA_SimpleParser(m_pDocument, false)); 27 auto pDataDocumentParser =
28 pdfium::MakeUnique<CXFA_SimpleParser>(m_pDocument, false);
27 if (pDataDocumentParser->StartParse(pDataDocument, XFA_XDPPACKET_Datasets) != 29 if (pDataDocumentParser->StartParse(pDataDocument, XFA_XDPPACKET_Datasets) !=
28 XFA_PARSESTATUS_Ready) { 30 XFA_PARSESTATUS_Ready) {
29 return false; 31 return false;
30 } 32 }
31 if (pDataDocumentParser->DoParse(nullptr) < XFA_PARSESTATUS_Done) 33 if (pDataDocumentParser->DoParse(nullptr) < XFA_PARSESTATUS_Done)
32 return false; 34 return false;
33 35
34 CXFA_Node* pImportDataRoot = pDataDocumentParser->GetRootNode(); 36 CXFA_Node* pImportDataRoot = pDataDocumentParser->GetRootNode();
35 if (!pImportDataRoot) 37 if (!pImportDataRoot)
36 return false; 38 return false;
(...skipping 16 matching lines...) Expand all
53 } else { 55 } else {
54 CFDE_XMLNode* pXMLNode = pImportDataRoot->GetXMLMappingNode(); 56 CFDE_XMLNode* pXMLNode = pImportDataRoot->GetXMLMappingNode();
55 CFDE_XMLNode* pParentXMLNode = pXMLNode->GetNodeItem(CFDE_XMLNode::Parent); 57 CFDE_XMLNode* pParentXMLNode = pXMLNode->GetNodeItem(CFDE_XMLNode::Parent);
56 if (pParentXMLNode) 58 if (pParentXMLNode)
57 pParentXMLNode->RemoveChildNode(pXMLNode); 59 pParentXMLNode->RemoveChildNode(pXMLNode);
58 pDataModel->InsertChild(pImportDataRoot); 60 pDataModel->InsertChild(pImportDataRoot);
59 } 61 }
60 m_pDocument->DoDataRemerge(false); 62 m_pDocument->DoDataRemerge(false);
61 return true; 63 return true;
62 } 64 }
OLDNEW
« no previous file with comments | « xfa/fxfa/parser/cxfa_dataimporter.h ('k') | xfa/fxfa/parser/cxfa_document_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698