Merge to XFA: Kill CFX_Object.

fpdfsdk/include/javascript/JS_Object.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 _JS_OBJECT_H_
 #define _JS_OBJECT_H_
 
 #include "../fsdk_define.h"  // For FX_UINT
 #include "../fsdk_mgr.h"  // For CPDFDoc_Environment
 #include "../fx_systemhandler.h"  // For IFX_SystemHandler
 #include "../jsapi/fxjs_v8.h"
 
 class CPDFSDK_PageView;
 class CJS_Object;
 class CJS_Timer;
 class CJS_Context;
 
-class CJS_EmbedObj : public CFX_Object
+class CJS_EmbedObj 
 {
 public:
         CJS_EmbedObj(CJS_Object* pJSObject);
         virtual ~CJS_EmbedObj();
 
         virtual void                            TimerProc(CJS_Timer* pTimer){};
 
         CJS_Timer*                                      BeginTimer(CPDFDoc_Environment * pApp, FX_UINT nElapse);
         void                                            EndTimer(CJS_Timer* pTimer);
 
         CJS_Object*                                     GetJSObject(){return m_pJSObject;};
         operator                                        CJS_Object* (){return m_pJSObject;};
 
         CPDFSDK_PageView *                      JSGetPageView(IFXJS_Context* cc);
         int                                                     MsgBox(CPDFDoc_Environment * pApp, CPDFSDK_PageView* pPageView, FX_LPCWSTR swMsg, FX_LPCWSTR swTitle = NULL, FX_UINT nType = 0, FX_UINT nIcon = 0);
         void                                            Alert(CJS_Context* pContext, FX_LPCWSTR swMsg);
 
 protected:
         CJS_Object*                                     m_pJSObject;
 };
 
-class CJS_Object : public CFX_Object
+class CJS_Object 
 {
 public:
         CJS_Object(JSFXObject pObject);
         virtual ~CJS_Object(void);
 
         void                                            MakeWeak();
 
         virtual FX_BOOL                         IsType(FX_LPCSTR sClassName){return TRUE;};
         virtual CFX_ByteString          GetClassName(){return "";};
 
@@ skipping 236 matching lines @@
         FX_DWORD                                                m_dwStartTime;
         FX_DWORD                                                m_dwTimeOut;
         FX_DWORD                                                m_dwElapse;
         CJS_Runtime*                                    m_pRuntime;
         CFX_WideString                                  m_swJScript;
         int                                                             m_nType; //0:Interval; 1:TimeOut
 
         CPDFDoc_Environment*                    m_pApp;
 };
 #endif //_JS_OBJECT_H_