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/fwl/core/fwl_widgetimp.cpp | |
| 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/fwl/core/fwl_widgetimp.cpp')
| -rw-r--r-- | xfa/fwl/core/fwl_widgetimp.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xfa/fwl/core/fwl_widgetimp.cpp b/xfa/fwl/core/fwl_widgetimp.cpp index 6e8ec09243..b59fd27713 100644 --- a/xfa/fwl/core/fwl_widgetimp.cpp +++ b/xfa/fwl/core/fwl_widgetimp.cpp @@ -15,7 +15,6 @@ #include "xfa/fwl/core/cfwl_themepart.h" #include "xfa/fwl/core/cfwl_themetext.h" #include "xfa/fwl/core/cfwl_widgetmgr.h" -#include "xfa/fwl/core/fwl_appimp.h" #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_app.h" #include "xfa/fwl/core/ifwl_form.h" @@ -179,7 +178,7 @@ FWL_Error CFWL_WidgetImp::Initialize() { if (!pAdapter) return FWL_Error::Indefinite; - SetOwnerApp(static_cast<CFWL_AppImp*>(FWL_GetApp()->GetImpl())); + SetOwnerApp(FWL_GetApp()); IFWL_Widget* pParent = m_pProperties->m_pParent; m_pWidgetMgr->InsertWidget(pParent, m_pInterface); @@ -492,9 +491,9 @@ IFWL_WidgetDelegate* CFWL_WidgetImp::SetDelegate( return pOldDelegate; } IFWL_App* CFWL_WidgetImp::GetOwnerApp() const { - return static_cast<IFWL_App*>(m_pOwnerApp->GetInterface()); + return m_pOwnerApp; } -FWL_Error CFWL_WidgetImp::SetOwnerApp(CFWL_AppImp* pOwnerApp) { +FWL_Error CFWL_WidgetImp::SetOwnerApp(IFWL_App* pOwnerApp) { m_pOwnerApp = pOwnerApp; return FWL_Error::Succeeded; } @@ -642,7 +641,7 @@ IFWL_ThemeProvider* CFWL_WidgetImp::GetAvailableTheme() { return pRet; } } while (pUp); - return FWL_GetApp()->GetThemeProvider(); + return nullptr; } CFWL_WidgetImp* CFWL_WidgetImp::GetRootOuter() { IFWL_Widget* pRet = m_pOuter; |