From 55fa356c8ce72c597e75fc591fc67597b1c019d5 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 4 May 2016 14:24:53 -0700 Subject: Cleanup IFWL_Adapter interfaces. This CL removes: * IFWL_AdapterNative * IFWL_Adapter{Widget|Thread}Mgr * IFWL_WidgetMgrDelegate * CFWL_SDAdapter{Widget|Thread}Mgr Methods which just returned have also been removed. Review-Url: https://codereview.chromium.org/1928963004 --- xfa/fxfa/include/xfa_ffapp.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'xfa/fxfa/include') diff --git a/xfa/fxfa/include/xfa_ffapp.h b/xfa/fxfa/include/xfa_ffapp.h index 774bebb06d..c8df27da5b 100644 --- a/xfa/fxfa/include/xfa_ffapp.h +++ b/xfa/fxfa/include/xfa_ffapp.h @@ -10,16 +10,16 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" #include "xfa/fgas/font/fgas_font.h" -#include "xfa/fwl/core/fwl_sdadapterimp.h" -#include "xfa/fwl/core/ifwl_adapternative.h" #include "xfa/fwl/core/ifwl_app.h" #include "xfa/fxfa/include/fxfa.h" +class CFWL_WidgetMgrDelegate; class CXFA_DefFontMgr; class CXFA_FWLAdapterWidgetMgr; class CXFA_FWLTheme; class CXFA_FFDocHandler; class CXFA_FontMgr; +class IFWL_AdapterTimerMgr; class CXFA_FileRead : public IFX_FileRead { public: @@ -34,10 +34,10 @@ class CXFA_FileRead : public IFX_FileRead { CFX_ObjectArray m_Data; }; -class CXFA_FFApp : public IFWL_AdapterNative { +class CXFA_FFApp { public: CXFA_FFApp(IXFA_AppProvider* pProvider); - ~CXFA_FFApp() override; + ~CXFA_FFApp(); CXFA_FFDocHandler* GetDocHandler(); CXFA_FFDoc* CreateDoc(IXFA_DocProvider* pProvider, @@ -47,11 +47,8 @@ class CXFA_FFApp : public IFWL_AdapterNative { IXFA_AppProvider* GetAppProvider() { return m_pProvider; } void SetDefaultFontMgr(CXFA_DefFontMgr* pFontMgr); - // IFWL_AdapterNative: - IFWL_AdapterWidgetMgr* GetWidgetMgr( - CFWL_WidgetMgrDelegate* pDelegate) override; - IFWL_AdapterThreadMgr* GetThreadMgr() override; - IFWL_AdapterTimerMgr* GetTimerMgr() override; + CXFA_FWLAdapterWidgetMgr* GetWidgetMgr(CFWL_WidgetMgrDelegate* pDelegate); + IFWL_AdapterTimerMgr* GetTimerMgr(); CXFA_FontMgr* GetXFAFontMgr(); IFX_FontMgr* GetFDEFontMgr(); @@ -72,7 +69,6 @@ class CXFA_FFApp : public IFWL_AdapterNative { CXFA_FWLAdapterWidgetMgr* m_pAdapterWidgetMgr; CFWL_WidgetMgrDelegate* m_pWidgetMgrDelegate; IFX_FontMgr* m_pFDEFontMgr; - CFWL_SDAdapterThreadMgr* m_pAdapterThreadMgr; }; #endif // XFA_FXFA_INCLUDE_XFA_FFAPP_H_ -- cgit v1.2.3