Merge to XFA: Kill CFX_Object.

xfa/include/fxfa/fxfa.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 _FXFA
 #define _FXFA
 class IFDE_XMLElement;
 class CXFA_Node;
@@ skipping 367 matching lines @@
     XFA_EVENT_InitCalculate,
     XFA_EVENT_InitVariables,
     XFA_EVENT_Calculate,
     XFA_EVENT_Validate,
     XFA_EVENT_Unknown,
 };
 #define XFA_VALIDATE_preSubmit          1
 #define XFA_VALIDATE_prePrint           2
 #define XFA_VALIDATE_preExecute         3
 #define XFA_VALIDATE_preSave            4
-class CXFA_EventParam : public CFX_Object
+class CXFA_EventParam
 {
 public:
     CXFA_EventParam()
     {
         m_pTarget = NULL;
         m_eType = XFA_EVENT_Unknown;
         m_wsResult.Empty();
         Reset();
     }
     void Reset()
@@ skipping 86 matching lines @@
     virtual FX_INT32            GetPageViewIndex() = 0;
     virtual void                        GetPageViewRect(CFX_RectF &rtPage) = 0;
 
     virtual void                        GetDisplayMatrix(CFX_Matrix &mt, const CFX_Rect &rtDisp, FX_INT32 iRotate) = 0;
 
     virtual FX_INT32            LoadPageView(IFX_Pause *pPause = NULL) = 0;
     virtual void                        UnloadPageView() = 0;
     virtual XFA_HWIDGET         GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) = 0;
     virtual IXFA_WidgetIterator* CreateWidgetIterator(FX_DWORD dwTraverseWay = XFA_TRAVERSEWAY_Form, FX_DWORD dwWidgetFilter = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_Viewable | XFA_WIDGETFILTER_AllType) = 0;
 };
-class CXFA_RenderOptions : public CFX_Object
+class CXFA_RenderOptions
 {
 public:
     CXFA_RenderOptions()
         : m_bPrint(FALSE)
         , m_bHighlight(TRUE)
     {
     }
     FX_BOOL                     m_bPrint;
     FX_BOOL                     m_bHighlight;
 };
@@ skipping 115 matching lines @@
 
     virtual FX_BOOL                             StartChecksum() = 0;
     virtual FX_BOOL                             UpdateChecksum(IFX_FileRead* pSrcFile, FX_FILESIZE offset = 0, size_t size = 0) = 0;
     virtual void                                FinishChecksum() = 0;
     virtual void                                GetChecksum(CFX_ByteString &bsChecksum) = 0;
 protected:
     ~IXFA_ChecksumContext() { }
 };
 IXFA_ChecksumContext*   XFA_Checksum_Create();
 #endif