From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
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 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'fpdfsdk/include/fpdfxfa')

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()
-- 
cgit v1.2.3