Merge to XFA: Kill CFX_Object.

xfa/src/fgas/src/font/fx_gdifont.h

Index: xfa/src/fgas/src/font/fx_gdifont.h
diff --git a/xfa/src/fgas/src/font/fx_gdifont.h b/xfa/src/fgas/src/font/fx_gdifont.h
index f6d88f38a0bd47fa11b2b24d07334f5c0da944ee..3c159f505704a615cf0093d0c6d8312db1247bfc 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);