Merge to XFA: Kill CFX_Object.

Not just a simple merge, but changes to remove CFX_Object from XFA.

Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1087053002

15 files changed, 35 insertions, 35 deletions

diff --git a/xfa/src/fgas/include/fx_datetime.h b/xfa/src/fgas/include/fx_datetime.h
index dd0a5d6147..d18b899fc6 100644
--- a/xfa/src/fgas/include/fx_datetime.h
+++ b/xfa/src/fgas/include/fx_datetime.h
@@ -21,7 +21,7 @@ enum FX_WEEKDAY {
 FX_BOOL		FX_IsLeapYear(FX_INT32 iYear);

 FX_INT32	FX_DaysInYear(FX_INT32 iYear);

 FX_BYTE		FX_DaysInMonth(FX_INT32 iYear, FX_BYTE iMonth);

-class CFX_Unitime : public CFX_Object

+class CFX_Unitime

 {

 public:

     CFX_Unitime()

@@ -278,7 +278,7 @@ typedef FX_DATETIMEZONE const * FX_LPCDATETIMEZONE;
 #if _FX_OS_ != _FX_ANDROID_

 #pragma pack(pop)

 #endif

-class CFX_DateTime : public CFX_Object

+class CFX_DateTime

 {

 public:

     CFX_DateTime() {}

diff --git a/xfa/src/fgas/include/fx_fnt.h b/xfa/src/fgas/include/fx_fnt.h
index d664853df7..491feaea37 100644
--- a/xfa/src/fgas/include/fx_fnt.h
+++ b/xfa/src/fgas/include/fx_fnt.h
@@ -73,7 +73,7 @@ public:
 #endif

 };

 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_

-typedef struct _FX_FONTMATCHPARAMS : public CFX_Object {

+typedef struct _FX_FONTMATCHPARAMS {

     FX_LPCWSTR				pwsFamily;

     FX_DWORD				dwFontStyles;

     FX_DWORD				dwUSB;

diff --git a/xfa/src/fgas/include/fx_locale.h b/xfa/src/fgas/include/fx_locale.h
index 6886974fd2..25a6dda4e1 100644
--- a/xfa/src/fgas/include/fx_locale.h
+++ b/xfa/src/fgas/include/fx_locale.h
@@ -108,7 +108,7 @@ public:
     virtual FX_BOOL FormatZero(const CFX_WideString& wsPattern, CFX_WideString& wsOutput) = 0;

     virtual FX_BOOL FormatNull(const CFX_WideString& wsPattern, CFX_WideString& wsOutput) = 0;

 };

-class CFX_Decimal : CFX_Object

+class CFX_Decimal

 {

 public:

     CFX_Decimal();

diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h
index 354d4bf2bb..850543786c 100644
--- a/xfa/src/fgas/include/fx_utl.h
+++ b/xfa/src/fgas/include/fx_utl.h
@@ -752,7 +752,7 @@ protected:
     friend class CFX_CPLTree<baseType>;

 };

 template<class baseType>

-class CFX_CPLTree : public CFX_Object

+class CFX_CPLTree

 {

 public:

     typedef CFX_CPLTreeNode<baseType>	CPLTreeNode;

diff --git a/xfa/src/fgas/src/crt/fx_stream.h b/xfa/src/fgas/src/crt/fx_stream.h
index 630a0fb77f..30cb98486e 100644
--- a/xfa/src/fgas/src/crt/fx_stream.h
+++ b/xfa/src/fgas/src/crt/fx_stream.h
@@ -17,7 +17,7 @@ class CFX_TextStream;
 class CFX_FileRead;

 class CFX_FileWrite;

 class CFX_BufferAccImp;

-class CFX_StreamImp : public CFX_ThreadLock, public CFX_Object

+class CFX_StreamImp : public CFX_ThreadLock

 {

 public:

     virtual void			Release()

@@ -197,7 +197,7 @@ enum FX_STREAMTYPE {
     FX_STREAMTYPE_Stream		,

     FX_STREAMTYPE_BufferRead	,

 };

-class CFX_Stream : public IFX_Stream, public CFX_ThreadLock, public CFX_Object

+class CFX_Stream : public IFX_Stream, public CFX_ThreadLock

 {

 public:

     CFX_Stream();

@@ -245,7 +245,7 @@ protected:
     FX_INT32				m_iLength;

     FX_INT32				m_iRefCount;

 };

-class CFX_TextStream : public IFX_Stream, public CFX_ThreadLock, public CFX_Object

+class CFX_TextStream : public IFX_Stream, public CFX_ThreadLock

 {

 public:

     CFX_TextStream(IFX_Stream *pStream, FX_BOOL bDelStream);

@@ -292,7 +292,7 @@ protected:
     void		InitStream();

 };

 #ifdef FX_FILESIZE

-class CFGAS_FileRead : public IFX_FileRead, public CFX_Object

+class CFGAS_FileRead : public IFX_FileRead

 {

 public:

     CFGAS_FileRead(IFX_Stream *pStream, FX_BOOL bReleaseStream);

@@ -308,7 +308,7 @@ protected:
     IFX_Stream				*m_pStream;

 };

 #else

-class CFGAS_FileRead : public IFX_FileRead, public CFX_Object

+class CFGAS_FileRead : public IFX_FileRead

 {

 public:

     CFGAS_FileRead(IFX_Stream *pStream, FX_BOOL bReleaseStream);

@@ -327,7 +327,7 @@ protected:
 };

 #endif

 #ifdef FX_FILESIZE

-class CFX_BufferAccImp : public IFX_FileRead, public CFX_Object

+class CFX_BufferAccImp : public IFX_FileRead

 {

 public:

     CFX_BufferAccImp(IFX_BufferRead *pBufferRead, FX_FILESIZE iFileSize, FX_BOOL bReleaseStream);

@@ -344,7 +344,7 @@ protected:
     FX_FILESIZE				m_iBufSize;

 };

 #else

-class CFX_BufferAccImp : public IFX_FileRead, public CFX_Object

+class CFX_BufferAccImp : public IFX_FileRead

 {

 public:

     CFX_BufferAccImp(IFX_BufferRead *pBufferRead, FX_INT32 iFileSize, FX_BOOL bReleaseStream);

@@ -364,7 +364,7 @@ protected:
 };

 #endif

 #ifdef FX_FILESIZE

-class CFGAS_FileWrite : public IFX_FileWrite, public CFX_Object

+class CFGAS_FileWrite : public IFX_FileWrite

 {

 public:

     CFGAS_FileWrite(IFX_Stream *pStream, FX_BOOL bReleaseStream);

@@ -382,7 +382,7 @@ protected:
     FX_BOOL					m_bReleaseStream;

 };

 #else

-class CFGAS_FileWrite : public IFX_FileWrite, public CFX_Object

+class CFGAS_FileWrite : public IFX_FileWrite

 {

 public:

     CFGAS_FileWrite(IFX_Stream *pStream, FX_BOOL bReleaseStream);

diff --git a/xfa/src/fgas/src/crt/fx_utils.cpp b/xfa/src/fgas/src/crt/fx_utils.cpp
index 0ee8152854..6f8452237f 100644
--- a/xfa/src/fgas/src/crt/fx_utils.cpp
+++ b/xfa/src/fgas/src/crt/fx_utils.cpp
@@ -340,7 +340,7 @@ void CFX_BaseMassArray::RemoveAll(FX_BOOL bLeaveMemory)
 {

     m_pData->RemoveAll(bLeaveMemory);

 }

-typedef struct _FX_BASEDISCRETEARRAYDATA : public CFX_Object {

+typedef struct _FX_BASEDISCRETEARRAYDATA {

     FX_INT32		iBlockSize;

     FX_INT32		iChunkSize;

     FX_INT32		iChunkCount;

diff --git a/xfa/src/fgas/src/font/fx_gdifont.h b/xfa/src/fgas/src/font/fx_gdifont.h
index f6d88f38a0..3c159f5057 100644
--- a/xfa/src/fgas/src/font/fx_gdifont.h
+++ b/xfa/src/fgas/src/font/fx_gdifont.h
@@ -13,7 +13,7 @@ typedef struct _FX_GDIGOCACHE {
     FX_LPBYTE		pOutline;

 } FX_GDIGOCACHE, * FX_LPGDIGOCACHE;

 typedef FX_GDIGOCACHE const * FX_LPCGDIGOCACHE;

-class CFX_GdiFontCache : public CFX_Object

+class CFX_GdiFontCache

 {

 public:

     CFX_GdiFontCache();

@@ -23,7 +23,7 @@ public:
 protected:

     CFX_MapPtrToPtr		m_GlyphMap;

 };

-class CFX_GdiFont : public IFX_Font, public CFX_ThreadLock, public CFX_Object

+class CFX_GdiFont : public IFX_Font, public CFX_ThreadLock

 {

 public:

     CFX_GdiFont(IFX_FontMgr *pFontMgr);

diff --git a/xfa/src/fgas/src/font/fx_gefont.h b/xfa/src/fgas/src/font/fx_gefont.h
index 430ff09852..585a04c638 100644
--- a/xfa/src/fgas/src/font/fx_gefont.h
+++ b/xfa/src/fgas/src/font/fx_gefont.h
@@ -11,7 +11,7 @@ class CFX_GEFontMgr;
 #ifndef FXFONT_SUBST_ITALIC

 #define FXFONT_SUBST_ITALIC	0x02

 #endif

-class CFX_GEFont : public IFX_Font, public CFX_ThreadLock, public CFX_Object

+class CFX_GEFont : public IFX_Font, public CFX_ThreadLock

 {

 public:

     CFX_GEFont(const CFX_GEFont &src, FX_DWORD dwFontStyles);

diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.h b/xfa/src/fgas/src/font/fx_stdfontmgr.h
index adcc737ca5..ba44233ad0 100644
--- a/xfa/src/fgas/src/font/fx_stdfontmgr.h
+++ b/xfa/src/fgas/src/font/fx_stdfontmgr.h
@@ -9,7 +9,7 @@
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_

 FX_INT32 FX_GetSimilarValue(FX_LPCFONTDESCRIPTOR pFont, FX_DWORD dwFontStyles);

 FX_LPCFONTDESCRIPTOR FX_DefFontMatcher(FX_LPFONTMATCHPARAMS pParams, const CFX_FontDescriptors &fonts, FX_LPVOID pUserData);

-class CFX_StdFontMgrImp : public IFX_FontMgr, public CFX_Object

+class CFX_StdFontMgrImp : public IFX_FontMgr

 {

 public:

     CFX_StdFontMgrImp(FX_LPEnumAllFonts pEnumerator, FX_LPMatchFont pMatcher, FX_LPVOID pUserData);

@@ -48,7 +48,7 @@ protected:
 };

 FX_DWORD FX_GetGdiFontStyles(const LOGFONTW &lf);

 #else

-class CFX_FontDescriptor : public CFX_Object

+class CFX_FontDescriptor

 {

 public:

     CFX_FontDescriptor()

@@ -92,7 +92,7 @@ public:
     };

 };

 typedef CFX_ArrayTemplate<FX_FontDescriptorInfo> CFX_FontDescriptorInfos;

-struct FX_HandleParentPath : public CFX_Object {

+struct FX_HandleParentPath {

     FX_HandleParentPath()

     {

     }

@@ -104,7 +104,7 @@ struct FX_HandleParentPath : public CFX_Object {
     void* pFileHandle;

     CFX_ByteString bsParentPath;

 };

-class CFX_FontSourceEnum_File : public IFX_FontSourceEnum, public CFX_Object

+class CFX_FontSourceEnum_File : public IFX_FontSourceEnum

 {

 public:

     CFX_FontSourceEnum_File();

@@ -127,7 +127,7 @@ typedef CFX_MapPtrTemplate<FX_DWORD, CFX_ArrayTemplate<IFX_Font*>* > CFX_HashFon
 typedef CFX_MapPtrTemplate<FX_WCHAR, IFX_Font*> CFX_UnicodeFontMap;

 typedef CFX_MapPtrTemplate<IFX_FileAccess*, CFX_ArrayTemplate<IFX_Font*>* > CFX_FileFontMap;

 typedef CFX_MapPtrTemplate<IFX_Font*, IFX_FileRead*> CFX_FonStreamtMap;

-class CFX_FontMgrImp : public IFX_FontMgr, public CFX_Object

+class CFX_FontMgrImp : public IFX_FontMgr

 {

 public:

     CFX_FontMgrImp(IFX_FontSourceEnum* pFontEnum, IFX_FontMgrDelegate* pDelegate = NULL, FX_LPVOID pUserData = NULL);

diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.h b/xfa/src/fgas/src/layout/fx_rtfbreak.h
index bf5f1ee4b5..c8f69277da 100644
--- a/xfa/src/fgas/src/layout/fx_rtfbreak.h
+++ b/xfa/src/fgas/src/layout/fx_rtfbreak.h
@@ -8,7 +8,7 @@
 #define _FX_RTFBREAK_IMP

 class CFX_RTFLine;

 class CFX_RTFBreak;

-class CFX_RTFLine : public CFX_Object

+class CFX_RTFLine

 {

 public:

     CFX_RTFLine() : m_LinePieces(16)

@@ -78,7 +78,7 @@ public:
     FX_INT32			m_iArabicChars;

     FX_INT32			m_iMBCSChars;

 };

-class CFX_RTFBreak : public IFX_RTFBreak, public CFX_Object

+class CFX_RTFBreak : public IFX_RTFBreak

 {

 public:

     CFX_RTFBreak(FX_DWORD dwPolicies);

diff --git a/xfa/src/fgas/src/layout/fx_textbreak.h b/xfa/src/fgas/src/layout/fx_textbreak.h
index c5bbc40946..a80b16c1b3 100644
--- a/xfa/src/fgas/src/layout/fx_textbreak.h
+++ b/xfa/src/fgas/src/layout/fx_textbreak.h
@@ -8,7 +8,7 @@
 #define _FX_TEXTBREAK_IMP

 class CFX_TxtLine;

 class CFX_Txtbreak;

-class CFX_TxtLine : public CFX_Object

+class CFX_TxtLine

 {

 public:

     CFX_TxtLine(FX_INT32 iBlockSize) : m_iStart(0)

@@ -66,7 +66,7 @@ public:
     FX_INT32			m_iWidth;

     FX_INT32			m_iArabicChars;

 };

-class CFX_TxtBreak : public IFX_TxtBreak, public CFX_Object

+class CFX_TxtBreak : public IFX_TxtBreak

 {

 public:

     CFX_TxtBreak(FX_DWORD dwPolicies);

diff --git a/xfa/src/fgas/src/localization/fx_locale.cpp b/xfa/src/fgas/src/localization/fx_locale.cpp
index e519e37257..4998201871 100644
--- a/xfa/src/fgas/src/localization/fx_locale.cpp
+++ b/xfa/src/fgas/src/localization/fx_locale.cpp
@@ -256,7 +256,7 @@ static const FX_FLOAT gs_fraction_scales[] = {0.1f, 0.01f, 0.001f, 0.0001f, 0.00
                                               0.0000001f, 0.00000001f, 0.000000001f, 0.0000000001f, 0.00000000001f

                                              };

 static const FX_INT32 gs_fraction_count = sizeof(gs_fraction_scales) / sizeof(FX_FLOAT);

-class CFX_LCNumeric : public CFX_Object

+class CFX_LCNumeric

 {

 public:

     CFX_LCNumeric();

diff --git a/xfa/src/fgas/src/localization/fx_localeimp.h b/xfa/src/fgas/src/localization/fx_localeimp.h
index 7698388020..c7d534d106 100644
--- a/xfa/src/fgas/src/localization/fx_localeimp.h
+++ b/xfa/src/fgas/src/localization/fx_localeimp.h
@@ -7,7 +7,7 @@
 #ifndef _FX_LOCALE_IMP_H_

 #define _FX_LOCALE_IMP_H_

 class CFX_LCNumeric;

-class CFX_Locale : public IFX_Locale, public CFX_Object

+class CFX_Locale : public IFX_Locale

 {

 public:

     CFX_Locale(CXML_Element* pLocaleData);

@@ -33,7 +33,7 @@ protected:
     virtual ~CFX_Locale();

     CXML_Element* m_pElement;

 };

-class CFX_FormatString : public IFX_FormatString, public CFX_Object

+class CFX_FormatString : public IFX_FormatString

 {

 public:

     CFX_FormatString(IFX_LocaleMgr* pLocaleMgr, FX_BOOL bUseLCID);

diff --git a/xfa/src/fgas/src/localization/fx_localemgr.h b/xfa/src/fgas/src/localization/fx_localemgr.h
index b23940e8d5..5e995b2e1b 100644
--- a/xfa/src/fgas/src/localization/fx_localemgr.h
+++ b/xfa/src/fgas/src/localization/fx_localemgr.h
@@ -6,7 +6,7 @@
 

 #ifndef _FX_LOCALEMGR_IMP_H_

 #define _FX_LOCALEMGR_IMP_H_

-class CFX_LocaleMgr : public IFX_LocaleMgr, public CFX_Object

+class CFX_LocaleMgr : public IFX_LocaleMgr

 {

 public:

     CFX_LocaleMgr(FX_WORD wDefLCID);

diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.h b/xfa/src/fgas/src/xml/fx_sax_imp.h
index f18173183f..444bcbdf8e 100644
--- a/xfa/src/fgas/src/xml/fx_sax_imp.h
+++ b/xfa/src/fgas/src/xml/fx_sax_imp.h
@@ -7,7 +7,7 @@
 #ifndef _FX_SAX_IMP_

 #define _FX_SAX_IMP_

 #define FX_SAXFILE_BUFSIZE	32768

-class CFX_SAXFile : public CFX_Object

+class CFX_SAXFile

 {

 public:

     CFX_SAXFile();

@@ -39,7 +39,7 @@ enum FX_SAXMODE {
     FX_SAXMODE_TargetData,

     FX_SAXMODE_MAX,

 };

-class CFX_SAXItem : public CFX_Object

+class CFX_SAXItem

 {

 public:

     CFX_SAXItem() : m_pNode(NULL)

@@ -56,7 +56,7 @@ public:
     CFX_SAXItem*	m_pPrev;

     CFX_SAXItem*	m_pNext;

 };

-class CFX_SAXCommentContext : public CFX_Object

+class CFX_SAXCommentContext

 {

 public:

     CFX_SAXCommentContext() : m_iHeaderCount(0)

@@ -66,7 +66,7 @@ public:
     FX_INT32		m_iHeaderCount;

     FX_INT32		m_iTailCount;

 };

-class CFX_SAXReader : public IFX_SAXReader, public CFX_Object

+class CFX_SAXReader : public IFX_SAXReader

 {

 public:

     CFX_SAXReader();