Merge to XFA: Kill CFX_Object.

xfa/src/fxfa/src/common/xfa_document.h

 // 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
 
 #ifndef _XFA_DOCUMENT_H
 #define _XFA_DOCUMENT_H
 class IXFA_DocParser;
 class CXFA_LayoutProcessor;
@@ skipping 88 matching lines @@
 #define XFA_DOCFLAG_StrictScoping       0x0001
 #define XFA_DOCFLAG_HasInteractive      0x0002
 #define XFA_DOCFLAG_Interactive         0x0004
 #define XFA_DOCFLAG_Scripting           0x0008
 class CScript_DataWindow;
 class CScript_EventPseudoModel;
 class CScript_HostPseudoModel;
 class CScript_LogPseudoModel;
 class CScript_LayoutPseudoModel;
 class CScript_SignaturePseudoModel;
-class CXFA_Document : public IXFA_ObjFactory, public CFX_Object
+class CXFA_Document : public IXFA_ObjFactory
 {
 public:
     CXFA_Document(IXFA_DocParser *pParser);
     ~CXFA_Document();
     CXFA_Node*                                  GetRoot() const
     {
         return m_pRootNode;
     }
     IXFA_DocParser*                             GetParser() const
     {
@@ skipping 48 matching lines @@
     CScript_HostPseudoModel*                    m_pScriptHost;
     CScript_LogPseudoModel*                             m_pScriptLog;
     CScript_LayoutPseudoModel*                  m_pScriptLayout;
     CScript_SignaturePseudoModel*               m_pScriptSignature;
     CXFA_NodeSet                                                m_rgPurgeNodes;
     XFA_VERSION                                                 m_eCurVersionMode;
     FX_DWORD                                                    m_dwDocFlags;
     friend class CXFA_SimpleParser;
 };
 #endif