Remove IXFA_* interfaces.

xfa/fxfa/app/xfa_ffdoc.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/xfa_ffdoc.h"
+#include "xfa/include/fxfa/xfa_ffdoc.h"
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fxcrt/include/fx_ext.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "xfa/fde/xml/fde_xml_imp.h"
 #include "xfa/fgas/crt/fgas_algorithm.h"
 #include "xfa/fwl/core/ifwl_notedriver.h"
-#include "xfa/fxfa/app/xfa_ffapp.h"
-#include "xfa/fxfa/app/xfa_ffdocview.h"
+#include "xfa/include/fxfa/xfa_ffapp.h"
+#include "xfa/include/fxfa/xfa_ffdocview.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 #include "xfa/fxfa/app/xfa_ffwidget.h"
-#include "xfa/fxfa/app/xfa_fontmgr.h"
+#include "xfa/include/fxfa/xfa_fontmgr.h"
 #include "xfa/fxfa/parser/xfa_docdata.h"
+#include "xfa/fxfa/parser/xfa_parser_imp.h"
+#include "xfa/fxfa/parser/xfa_document_serialize.h"

[Tom Sepez, 2016/03/31 17:01:57]

nit: alphabetize

[dsinclair, 2016/03/31 19:52:26]

Doh, forgot to run sort-headers.py

+#include "xfa/include/fxfa/xfa_checksum.h"
 #include "xfa/fxfa/parser/xfa_parser.h"
+#include "xfa/fxfa/parser/xfa_parser_imp.h"
 
 CXFA_FFDoc::CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider)
     : m_pDocProvider(pDocProvider),
       m_pDocument(nullptr),
       m_pStream(nullptr),
       m_pApp(pApp),
       m_pNotify(nullptr),
       m_pPDFDoc(nullptr),
       m_dwDocType(XFA_DOCTYPE_Static),
       m_bOwnStream(TRUE) {}
 CXFA_FFDoc::~CXFA_FFDoc() {
   CloseDoc();
 }
 uint32_t CXFA_FFDoc::GetDocType() {
   return m_dwDocType;
 }
 int32_t CXFA_FFDoc::StartLoad() {
   m_pNotify = new CXFA_FFNotify(this);
-  IXFA_DocParser* pDocParser = IXFA_DocParser::Create(m_pNotify);
+  CXFA_DocumentParser* pDocParser = new CXFA_DocumentParser(m_pNotify);
   int32_t iStatus = pDocParser->StartParse(m_pStream);
   m_pDocument = pDocParser->GetDocument();
   return iStatus;
 }
 FX_BOOL XFA_GetPDFContentsFromPDFXML(CFDE_XMLNode* pPDFElement,
                                      uint8_t*& pByteBuffer,
                                      int32_t& iBufferSize) {
   CFDE_XMLElement* pDocumentElement = NULL;
   for (CFDE_XMLNode* pXMLNode =
            pPDFElement->GetNodeItem(CFDE_XMLNode::FirstChild);
@@ skipping 123 matching lines @@
   CXFA_Node* pDynamicRender =
       pAcrobat7->GetFirstChildByClass(XFA_ELEMENT_DynamicRender);
   if (!pDynamicRender) {
     return;
   }
   CFX_WideString wsType;
   if (pDynamicRender->TryContent(wsType) && wsType == FX_WSTRC(L"required")) {
     m_dwDocType = XFA_DOCTYPE_Dynamic;
   }
 }
-IXFA_DocView* CXFA_FFDoc::CreateDocView(uint32_t dwView) {
+CXFA_FFDocView* CXFA_FFDoc::CreateDocView(uint32_t dwView) {
   CXFA_FFDocView* pDocView =
       (CXFA_FFDocView*)m_mapTypeToDocView.GetValueAt((void*)(uintptr_t)dwView);
   if (!pDocView) {
     pDocView = new CXFA_FFDocView(this);
     m_mapTypeToDocView.SetAt((void*)(uintptr_t)dwView, pDocView);
   }
   return pDocView;
 }
-CXFA_FFDocView* CXFA_FFDoc::GetDocView(IXFA_DocLayout* pLayout) {
+CXFA_FFDocView* CXFA_FFDoc::GetDocView(CXFA_LayoutProcessor* pLayout) {
   FX_POSITION ps = m_mapTypeToDocView.GetStartPosition();
   while (ps) {
     void* pType;
     CXFA_FFDocView* pDocView;
     m_mapTypeToDocView.GetNextAssoc(ps, pType, (void*&)pDocView);
     if (pDocView->GetXFALayout() == pLayout) {
       return pDocView;
     }
   }
   return NULL;
@@ skipping 181 matching lines @@
   if (!pNode) {
     return NULL;
   }
   CFDE_XMLNode* pXMLNode = pNode->GetXMLMappingNode();
   return (pXMLNode && pXMLNode->GetType() == FDE_XMLNODE_Element)
              ? static_cast<CFDE_XMLElement*>(pXMLNode)
              : NULL;
 }
 FX_BOOL CXFA_FFDoc::SavePackage(const CFX_WideStringC& wsPackage,
                                 IFX_FileWrite* pFile,
-                                IXFA_ChecksumContext* pCSContext) {
-  IXFA_PacketExport* pExport = IXFA_PacketExport::Create(m_pDocument);
-  if (!pExport) {
-    return FALSE;
-  }
+                                CXFA_ChecksumContext* pCSContext) {
+  CXFA_DataExporter* pExport = new CXFA_DataExporter(m_pDocument);
   uint32_t packetHash =
       FX_HashCode_String_GetW(wsPackage.GetPtr(), wsPackage.GetLength());
   CXFA_Node* pNode = NULL;
   if (packetHash == XFA_HASHCODE_Xfa) {
     pNode = m_pDocument->GetRoot();
   } else {
     pNode = ToNode(m_pDocument->GetXFAObject(packetHash));
   }
   FX_BOOL bFlags = FALSE;
   if (pNode) {
     CFX_ByteString bsChecksum;
     if (pCSContext) {
       pCSContext->GetChecksum(bsChecksum);
     }
     bFlags = pExport->Export(pFile, pNode, 0, bsChecksum.GetLength()
                                                   ? (const FX_CHAR*)bsChecksum
                                                   : NULL);
   } else {
     bFlags = pExport->Export(pFile);
   }
   pExport->Release();
   return bFlags;
 }
 FX_BOOL CXFA_FFDoc::ImportData(IFX_FileRead* pStream, FX_BOOL bXDP) {
   FX_BOOL bRet = FALSE;
-  IXFA_PacketImport* pImport = IXFA_PacketImport::Create(m_pDocument);
-  if (pImport) {
-    bRet = pImport->ImportData(pStream);
-    pImport->Release();
-  }
+  CXFA_DataImporter* pImport = new CXFA_DataImporter(m_pDocument);

[Tom Sepez, 2016/03/31 17:01:57]

nit: if this were std::unique_ptr<..., ReleaseDeleter<CFXA_DataImporter>

[dsinclair, 2016/03/31 19:52:26]

Done.

+  bRet = pImport->ImportData(pStream);

[Tom Sepez, 2016/03/31 17:01:57]

... then we could lose the bret local and just return here.

[dsinclair, 2016/03/31 19:52:26]

Done.

+  pImport->Release();
   return bRet;
 }