Merge to XFA: Kill CFX_Object.

core/include/fpdfdoc/fpdf_tagged.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 _FPDF_TAGGED_H_
 #define _FPDF_TAGGED_H_
 class CPDF_StructTree;
 class CPDF_StructElement;
 struct CPDF_StructKid;
 class CPDF_Document;
 class CPDF_Page;
 class IPDF_ReflowEngine;
 class IPDF_ReflowedPage;
-class CPDF_StructTree : public CFX_Object
+class CPDF_StructTree 
 {
 public:
 
     static CPDF_StructTree* LoadDoc(const CPDF_Document* pDoc);
 
     static CPDF_StructTree* LoadPage(const CPDF_Document* pDoc, const CPDF_Dictionary* pPageDict);
 
     virtual ~CPDF_StructTree() {}
 
     virtual int                 CountTopElements() const = 0;
@@ skipping 31 matching lines @@
             FX_DWORD                    m_RefObjNum;
         } m_StreamContent;
         struct {
 
             FX_DWORD                    m_PageObjNum;
 
             FX_DWORD                    m_RefObjNum;
         } m_Object;
     };
 };
-class CPDF_StructElement : public CFX_Object
+class CPDF_StructElement 
 {
 public:
     virtual ~CPDF_StructElement() { }
 
     virtual CPDF_StructTree*    GetTree() const = 0;
 
     virtual const CFX_ByteString&       GetType() const = 0;
 
     virtual CPDF_StructElement* GetParent() const = 0;
 
@@ skipping 12 matching lines @@
     virtual CFX_ByteString              GetName(FX_BSTR owner, FX_BSTR name, FX_BSTR default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0;
 
     virtual FX_ARGB                             GetColor(FX_BSTR owner, FX_BSTR name, FX_ARGB default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0;
 
     virtual FX_FLOAT                    GetNumber(FX_BSTR owner, FX_BSTR name, FX_FLOAT default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0;
 
     virtual int                                 GetInteger(FX_BSTR owner, FX_BSTR name, int default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0;
 
 };
 #endif