Merge to XFA: Kill CFX_Object.

core/src/fxge/win32/win32_int.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
 
 struct  WINDIB_Open_Args_;
 class CGdiplusExt
 {
 public:
@@ skipping 40 matching lines @@
     FX_BOOL         GdiRemoveFontMemResourceEx(void* handle);
     void*                       m_Functions[100];
     void*           m_pGdiAddFontMemResourceEx;
     void*           m_pGdiRemoveFontMemResourseEx;
     CFX_DIBitmap*       LoadDIBitmap(WINDIB_Open_Args_ args);
 protected:
     HMODULE                     m_hModule;
     HMODULE         m_GdiModule;
 };
 #include "dwrite_int.h"
-class CWin32Platform : public CFX_Object
+class CWin32Platform 
 {
 public:
     FX_BOOL                     m_bHalfTone;
     CGdiplusExt         m_GdiplusExt;
     CDWriteExt      m_DWriteExt;
 };
 class CGdiDeviceDriver : public IFX_RenderDeviceDriver
 {
 protected:
     virtual int         GetDeviceCaps(int caps_id);
@@ skipping 85 matching lines @@
                               int alpha_flag, void* pIccTransform);
     virtual FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap, FX_DWORD color, int dest_left, int dest_top,
                                   int dest_width, int dest_height, const FX_RECT* pClipRect, FX_DWORD flags,
                                   int alpha_flag, void* pIccTransform, int blend_type);
     virtual FX_BOOL     StartDIBits(const CFX_DIBSource* pBitmap, int bitmap_alpha, FX_DWORD color,
                                 const CFX_AffineMatrix* pMatrix, FX_DWORD render_flags, FX_LPVOID& handle,
                                 int alpha_flag, void* pIccTransform, int blend_type);
     int                         m_HorzSize, m_VertSize;
     FX_BOOL                     m_bSupportROP;
 };
-class CPSOutput : public IFX_PSOutput, public CFX_Object
+class CPSOutput : public IFX_PSOutput
 {
 public:
     CPSOutput(HDC hDC);
     virtual ~CPSOutput();
     virtual void                        Release()
     {
         delete this;
     }
     void Init();
     virtual void        OutputPS(FX_LPCSTR string, int len);
@@ skipping 51 matching lines @@
         return (void*)m_hDC;
     }
     HDC                         m_hDC;
     FX_BOOL                     m_bCmykOutput;
     int                         m_Width, m_Height, m_nBitsPerPixel;
     int                         m_HorzSize, m_VertSize;
     CPSOutput*          m_pPSOutput;
     CFX_PSRenderer      m_PSRenderer;
 };
 void _Color2Argb(FX_ARGB& argb, FX_DWORD color, int alpha_flag, void* pIccTransform);