From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: 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 --- fpdfsdk/include/fpdfxfa/fpdfxfa_app.h | 2 +- fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h | 2 +- fpdfsdk/include/fpdfxfa/fpdfxfa_page.h | 4 +--- fpdfsdk/include/fpdfxfa/fpdfxfa_util.h | 4 ++-- fpdfsdk/include/fsdk_baseannot.h | 2 +- fpdfsdk/include/fsdk_define.h | 4 ++-- fpdfsdk/include/fsdk_rendercontext.h | 2 +- fpdfsdk/include/javascript/JS_Object.h | 4 ++-- fpdfsdk/src/fpdf_dataavail.cpp | 2 +- fpdfsdk/src/fpdfview.cpp | 2 +- fpdfsdk/src/jsapi/fxjs_v8.cpp | 4 ++-- 11 files changed, 15 insertions(+), 17 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h index c77aae3b12..a2bc2cc5a7 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h @@ -11,7 +11,7 @@ class CPDFXFA_App; class IFXJS_Runtime; class CJS_RuntimeFactory; -class CPDFXFA_App : public IXFA_AppProvider, public CFX_Object +class CPDFXFA_App : public IXFA_AppProvider { public: CPDFXFA_App(); diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h index 317200c2fa..954162e338 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h @@ -16,7 +16,7 @@ class IFXJS_Runtime; class IFXJS_Context; class IXFA_DocHandler; -class CPDFXFA_Document : public IXFA_DocProvider, public CFX_Object +class CPDFXFA_Document : public IXFA_DocProvider { public: CPDFXFA_Document(CPDF_Document* pPDFDoc, CPDFXFA_App* pProvider); diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h index 1d60c33e43..f55a42496d 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h @@ -7,9 +7,7 @@ #ifndef _FPDFXFA_PAGEVIEW_H_ #define _FPDFXFA_PAGEVIEW_H_ -class CPDFXFA_Page; - -class CPDFXFA_Page : public CFX_Object +class CPDFXFA_Page { public: CPDFXFA_Page(CPDFXFA_Document* pDoc, int page_index); diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h index 28904e2ca6..6c3d15e4f1 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h @@ -12,7 +12,7 @@ #define JS_STR_VIEWERVARIATION L"Full" #define JS_STR_VIEWERVERSION_XFA L"11" -class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr, public CFX_Object +class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr { public: CXFA_FWLAdapterTimerMgr(CPDFDoc_Environment* pEnv) : m_pEnv(pEnv) @@ -29,7 +29,7 @@ protected: CPDFDoc_Environment* m_pEnv; }; -class CFWL_TimerInfo : public CFX_Object +class CFWL_TimerInfo { public: CFWL_TimerInfo() diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h index 0655e9ca61..efa7c0be52 100644 --- a/fpdfsdk/include/fsdk_baseannot.h +++ b/fpdfsdk/include/fsdk_baseannot.h @@ -27,7 +27,7 @@ class CFX_RenderDevice; #define CFX_IntArray CFX_ArrayTemplate -class CPDFSDK_DateTime : public CFX_Object +class CPDFSDK_DateTime { public: CPDFSDK_DateTime(); diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index 3509e8e2ab..4c59a28f94 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -75,7 +75,7 @@ typedef unsigned int FX_UINT; #include "fpdfview.h" -class CPDF_CustomAccess FX_FINAL : public IFX_FileRead, public CFX_Object +class CPDF_CustomAccess FX_FINAL : public IFX_FileRead { public: CPDF_CustomAccess(FPDF_FILEACCESS* pFileAccess); @@ -95,7 +95,7 @@ public: FX_DWORD m_BufferOffset; }; -class CFPDF_FileStream : public IFX_FileStream, public CFX_Object +class CFPDF_FileStream : public IFX_FileStream { public: CFPDF_FileStream(FPDF_FILEHANDLER* pFS); diff --git a/fpdfsdk/include/fsdk_rendercontext.h b/fpdfsdk/include/fsdk_rendercontext.h index 51c37b3624..94ad48e7c9 100644 --- a/fpdfsdk/include/fsdk_rendercontext.h +++ b/fpdfsdk/include/fsdk_rendercontext.h @@ -10,7 +10,7 @@ #include "../include/fpdf_progressive.h" // Everything about rendering is put here: for OOM recovery -class CRenderContext : public CFX_Object +class CRenderContext { public: CRenderContext() { Clear(); } diff --git a/fpdfsdk/include/javascript/JS_Object.h b/fpdfsdk/include/javascript/JS_Object.h index 74af9ba12d..02d2f57663 100644 --- a/fpdfsdk/include/javascript/JS_Object.h +++ b/fpdfsdk/include/javascript/JS_Object.h @@ -17,7 +17,7 @@ class CJS_Object; class CJS_Timer; class CJS_Context; -class CJS_EmbedObj : public CFX_Object +class CJS_EmbedObj { public: CJS_EmbedObj(CJS_Object* pJSObject); @@ -39,7 +39,7 @@ protected: CJS_Object* m_pJSObject; }; -class CJS_Object : public CFX_Object +class CJS_Object { public: CJS_Object(JSFXObject pObject); diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp index 2deba316f9..a04e7a2120 100644 --- a/fpdfsdk/src/fpdf_dataavail.cpp +++ b/fpdfsdk/src/fpdf_dataavail.cpp @@ -80,7 +80,7 @@ private: FX_DOWNLOADHINTS* m_pDownloadHints; }; -class CFPDF_DataAvail : public CFX_Object +class CFPDF_DataAvail { public: CFPDF_DataAvail() diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index c0b39ed3b8..2430324f30 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -342,7 +342,7 @@ DLLEXPORT FPDF_BOOL STDCALL FPDF_LoadXFA(FPDF_DOCUMENT document) extern void CheckUnSupportError(CPDF_Document * pDoc, FX_DWORD err_code); -class CMemFile FX_FINAL: public IFX_FileRead, public CFX_Object +class CMemFile FX_FINAL: public IFX_FileRead { public: CMemFile(FX_BYTE* pBuf, FX_FILESIZE size):m_pBuf(pBuf),m_size(size) {} diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp index 2b77766b7a..f048b5319c 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -28,7 +28,7 @@ static double GetNan() } -class CJS_PrivateData: public CFX_Object +class CJS_PrivateData { public: CJS_PrivateData():ObjDefID(-1), pPrivate(NULL) {} @@ -37,7 +37,7 @@ public: }; -class CJS_ObjDefintion: public CFX_Object +class CJS_ObjDefintion { public: CJS_ObjDefintion(v8::Isolate* isolate, const wchar_t* sObjName, FXJSOBJTYPE eObjType, LP_CONSTRUCTOR pConstructor, LP_DESTRUCTOR pDestructor, unsigned bApplyNew): -- cgit v1.2.3