diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-10-18 16:48:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-18 16:48:16 -0700 |
| commit | 4e903136cf0f02578c0e47c6738b633c96814b62 (patch) | |
| tree | f6c85bfe408c728b9b2dbfcaf60316912945643d /xfa/fxfa | |
| parent | f328d0d378b8df8a3416988d96c34f1d3f9d26d1 (diff) | |
| download | pdfium-4e903136cf0f02578c0e47c6738b633c96814b62.tar.xz | |
Merge IFWL_App and FWL_AppImp together
The IFWL_App class just acts as a proxy to the FWL_AppImp code. This Cl removes
FWL_AppImp and merges the code back up to IFWL_App, simplifying the
object hierarchy.
Review-Url: https://codereview.chromium.org/2430563003
Diffstat (limited to 'xfa/fxfa')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffapp.cpp | 8 | ||||
| -rw-r--r-- | xfa/fxfa/app/xfa_fftext.cpp | 1 | ||||
| -rw-r--r-- | xfa/fxfa/app/xfa_ffwidget.cpp | 1 |
3 files changed, 3 insertions, 7 deletions
diff --git a/xfa/fxfa/app/xfa_ffapp.cpp b/xfa/fxfa/app/xfa_ffapp.cpp index 6bedcd41a0..642ee56e9a 100644 --- a/xfa/fxfa/app/xfa_ffapp.cpp +++ b/xfa/fxfa/app/xfa_ffapp.cpp @@ -74,18 +74,12 @@ void CXFA_FileRead::Release() { CXFA_FFApp::CXFA_FFApp(IXFA_AppProvider* pProvider) : m_pProvider(pProvider), m_pWidgetMgrDelegate(nullptr), - m_pFWLApp(IFWL_App::Create(this)) { + m_pFWLApp(pdfium::MakeUnique<IFWL_App>(this)) { FWL_SetApp(m_pFWLApp.get()); - m_pFWLApp->Initialize(); CXFA_TimeZoneProvider::Create(); } CXFA_FFApp::~CXFA_FFApp() { - if (m_pFWLApp) { - m_pFWLApp->Finalize(); - m_pFWLApp->Release(); - } - CXFA_TimeZoneProvider::Destroy(); } diff --git a/xfa/fxfa/app/xfa_fftext.cpp b/xfa/fxfa/app/xfa_fftext.cpp index 9fa6bafdf4..b8ad6716d0 100644 --- a/xfa/fxfa/app/xfa_fftext.cpp +++ b/xfa/fxfa/app/xfa_fftext.cpp @@ -7,6 +7,7 @@ #include "xfa/fxfa/app/xfa_fftext.h" #include "xfa/fwl/core/fwl_widgetdef.h" +#include "xfa/fwl/core/fwl_widgethit.h" #include "xfa/fxfa/app/xfa_ffdraw.h" #include "xfa/fxfa/app/xfa_textlayout.h" #include "xfa/fxfa/xfa_ffapp.h" diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index cac9ccf26d..0e84ad6be5 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -15,6 +15,7 @@ #include "core/fxge/cfx_gemodule.h" #include "core/fxge/cfx_pathdata.h" #include "core/fxge/cfx_renderdevice.h" +#include "xfa/fwl/core/fwl_widgethit.h" #include "xfa/fxfa/app/xfa_textlayout.h" #include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/fxfa_widget.h" |