Merge to XFA: Kill CFX_Object.

core/src/reflow/autoreflow.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 _AUTOREFLOW_H
 #define _AUTOREFLOW_H
 #include "../../include/reflow/reflowengine.h"
 #include "reflowedpage.h"
 class CPDF_AutoReflowElement;
 class CPDF_AutoReflowLayoutProvider;
 typedef CFX_ArrayTemplate<CPDF_AutoReflowElement*> CAR_ElmPtrArray;
 typedef CFX_ArrayTemplate<CPDF_PageObject*> CAR_ObjPtrArray;
-class CRF_CELL : public CFX_Object
+class CRF_CELL 
 {
 public:
     CRF_CELL() { };
     ~CRF_CELL() { };
     CFX_PtrList         m_ObjList;
     int                 m_CellWritingMode;
     FX_RECT             m_BBox;
 };
-class CPDF_AutoReflowElement : public IPDF_LayoutElement, public CFX_Object
+class CPDF_AutoReflowElement : public IPDF_LayoutElement
 {
 public:
     CPDF_AutoReflowElement(LayoutType layoutType = LayoutUnknown , CPDF_AutoReflowElement* pParent = NULL) ;
     ~CPDF_AutoReflowElement();
     LayoutType GetType()
     {
         return m_ElmType;
     }
     void        GetRect(CFX_FloatRect& rcRect) {};
 
@@ skipping 26 matching lines @@
     CPDF_AutoReflowElement* m_pParentElm;
     LayoutType          m_ElmType;
     CAR_ElmPtrArray m_ChildArray;
     CAR_ObjPtrArray m_ObjArray;
     FX_FLOAT            m_SpaceBefore;
 };
 #define AUTOREFLOW_STEP_GENERATELINE            1
 #define AUTOREFLOW_STEP_GENERATEParagraph       2
 #define AUTOREFLOW_STEP_CREATEELEMENT           3
 #define AUTOREFLOW_STEP_REMOVEDATA                      4
-class CPDF_AutoReflowLayoutProvider : public IPDF_LayoutProvider, public CFX_Object
+class CPDF_AutoReflowLayoutProvider : public IPDF_LayoutProvider
 {
 public:
     CPDF_AutoReflowLayoutProvider(CPDF_PageObjects* pPage, FX_BOOL bReadOrder);
     ~CPDF_AutoReflowLayoutProvider();
     void        SetLayoutProviderStyle(LAYOUTPROVIDER_STYLE Style)
     {
         m_Style = Style;
     }
     LayoutStatus StartLoad(IFX_Pause* pPause = NULL);
     LayoutStatus Continue();
@@ skipping 31 matching lines @@
     CPDF_PageObject* m_pPreObj;
     LayoutStatus m_Status;
     int m_WritingMode;
     CFX_PtrArray m_CellArray;
     FX_BOOL              m_bReadOrder;
     LAYOUTPROVIDER_STYLE m_Style;
     CFX_PtrArray m_cellArray;
     int                 m_Step;
 };
 #endif