Merge to XFA: Kill CFX_Object.

core/src/reflow/layoutprovider_taggedpdf.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 LayoutProvider_TaggedPDF_H
 #define LayoutProvider_TaggedPDF_H
 #include "../../include/reflow/reflowengine.h"
-class CPDF_LayoutElement : public IPDF_LayoutElement, public CFX_Object
+class CPDF_LayoutElement : public IPDF_LayoutElement
 {
 public:
     CPDF_LayoutElement();
     ~CPDF_LayoutElement();
 
     LayoutType  GetType();
     void        GetRect(CFX_FloatRect& rcRect) {};
 
     int         CountAttrValues(LayoutAttr attr_type);
 
@@ skipping 19 matching lines @@
     LayoutEnum ConvertLayoutEnum(CFX_ByteStringC Enum);
 
 protected:
     FX_BOOL             IsInheritable(LayoutAttr attr_type);
     CFX_ByteStringC GetAttrOwner(LayoutAttr attr_type);
     CFX_ByteStringC GetDefaultNameValue(LayoutAttr attr_type);
     FX_FLOAT            GetDefaultFloatValue(LayoutAttr attr_type);
     FX_COLORREF         GetDefaultColorValue(LayoutAttr attr_type);
     CFX_PtrArray        m_ObjArray;
 };
-class CPDF_LayoutProvider_TaggedPDF : public IPDF_LayoutProvider, public CFX_Object
+class CPDF_LayoutProvider_TaggedPDF : public IPDF_LayoutProvider
 {
 public:
     CPDF_LayoutProvider_TaggedPDF();
     ~CPDF_LayoutProvider_TaggedPDF();
     void                        SetLayoutProviderStyle(LAYOUTPROVIDER_STYLE style) {};
 
     void        Init(CPDF_PageObjects* pPage)
     {
         m_pPage = pPage;
         m_Status = LayoutReady;
@@ skipping 12 matching lines @@
     void ProcessElement(CPDF_LayoutElement*pParent, CPDF_StructElement* pTaggedElement);
     LayoutStatus        m_Status;
     CPDF_StructElement* m_pCurTaggedElement;
     CPDF_LayoutElement* m_pRoot;
     IFX_Pause*                  m_pPause;
     CPDF_PageObjects*   m_pPage;
     CPDF_StructTree*    m_pPageTree;
     int                                 m_TopElementIndex;
 };
 #endif