From 816d7e4a0dccc049a1defe8a17e1b05c211665e1 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 16 Aug 2017 11:08:33 -0400 Subject: Remove CFWL_WidgetMgrDelegate This class is actually an accidentally renamed interface. There is only one concrete class so fold the interface back into the concrete class. Change-Id: If921a34595fad85750389f071ffdc9a5eae09f8e Reviewed-on: https://pdfium-review.googlesource.com/11150 Reviewed-by: Lei Zhang Commit-Queue: dsinclair --- xfa/fxfa/cxfa_ffapp.cpp | 5 ++--- xfa/fxfa/cxfa_ffapp.h | 12 +++++------- xfa/fxfa/cxfa_ffcheckbutton.cpp | 3 +-- xfa/fxfa/cxfa_fffield.cpp | 5 ++--- xfa/fxfa/cxfa_ffpushbutton.cpp | 3 +-- 5 files changed, 11 insertions(+), 17 deletions(-) (limited to 'xfa/fxfa') diff --git a/xfa/fxfa/cxfa_ffapp.cpp b/xfa/fxfa/cxfa_ffapp.cpp index b766cdc40f..6c14a981db 100644 --- a/xfa/fxfa/cxfa_ffapp.cpp +++ b/xfa/fxfa/cxfa_ffapp.cpp @@ -77,12 +77,11 @@ CXFA_FWLTheme* CXFA_FFApp::GetFWLTheme() { return m_pFWLTheme.get(); } -CXFA_FWLAdapterWidgetMgr* CXFA_FFApp::GetWidgetMgr( - CFWL_WidgetMgrDelegate* pDelegate) { +CXFA_FWLAdapterWidgetMgr* CXFA_FFApp::GetWidgetMgr(CFWL_WidgetMgr* pDelegate) { if (!m_pAdapterWidgetMgr) { m_pAdapterWidgetMgr = pdfium::MakeUnique(); pDelegate->OnSetCapability(FWL_WGTMGR_DisableForm); - m_pWidgetMgrDelegate = pDelegate; + m_pWidgetMgr = pDelegate; } return m_pAdapterWidgetMgr.get(); } diff --git a/xfa/fxfa/cxfa_ffapp.h b/xfa/fxfa/cxfa_ffapp.h index 0da4e79173..80e30d4c7e 100644 --- a/xfa/fxfa/cxfa_ffapp.h +++ b/xfa/fxfa/cxfa_ffapp.h @@ -18,13 +18,13 @@ #include "xfa/fwl/cfwl_app.h" #include "xfa/fxfa/fxfa.h" +class CFWL_WidgetMgr; class CXFA_DefFontMgr; class CXFA_FWLAdapterWidgetMgr; class CXFA_FWLTheme; class CXFA_FFDocHandler; class CXFA_FontMgr; class IFWL_AdapterTimerMgr; -class CFWL_WidgetMgrDelegate; class CXFA_FFApp { public: @@ -36,7 +36,7 @@ class CXFA_FFApp { void SetDefaultFontMgr(std::unique_ptr pFontMgr); CXFA_FFDocHandler* GetDocHandler(); - CXFA_FWLAdapterWidgetMgr* GetWidgetMgr(CFWL_WidgetMgrDelegate* pDelegate); + CXFA_FWLAdapterWidgetMgr* GetWidgetMgr(CFWL_WidgetMgr* pDelegate); CFGAS_FontMgr* GetFDEFontMgr(); CXFA_FWLTheme* GetFWLTheme(); @@ -44,9 +44,7 @@ class CXFA_FFApp { const CFWL_App* GetFWLApp() const { return m_pFWLApp.get(); } IFWL_AdapterTimerMgr* GetTimerMgr() const; CXFA_FontMgr* GetXFAFontMgr() const; - CFWL_WidgetMgrDelegate* GetWidgetMgrDelegate() const { - return m_pWidgetMgrDelegate.Get(); - } + CFWL_WidgetMgr* GetWidgetMgr() const { return m_pWidgetMgr.Get(); } void ClearEventTargets(); @@ -77,9 +75,9 @@ class CXFA_FFApp { std::unique_ptr m_pFWLTheme; std::unique_ptr m_pFWLApp; - // |m_pWidgetMgrDelegate| has to be released before |m_pFWLApp|, since + // |m_pWidgetMgr| has to be released before |m_pFWLApp|, since // |m_pFWLApp| is its owner. - CFX_UnownedPtr m_pWidgetMgrDelegate; + CFX_UnownedPtr m_pWidgetMgr; }; #endif // XFA_FXFA_CXFA_FFAPP_H_ diff --git a/xfa/fxfa/cxfa_ffcheckbutton.cpp b/xfa/fxfa/cxfa_ffcheckbutton.cpp index c1dae57df8..65eb17d6d6 100644 --- a/xfa/fxfa/cxfa_ffcheckbutton.cpp +++ b/xfa/fxfa/cxfa_ffcheckbutton.cpp @@ -243,8 +243,7 @@ void CXFA_FFCheckButton::RenderWidget(CXFA_Graphics* pGS, m_pDataAcc->GetCheckButtonShape() == XFA_ATTRIBUTEENUM_Round); CFX_Matrix mt(1, 0, 0, 1, m_rtCheckBox.left, m_rtCheckBox.top); mt.Concat(mtRotate); - GetApp()->GetWidgetMgrDelegate()->OnDrawWidget(m_pNormalWidget.get(), pGS, - &mt); + GetApp()->GetWidgetMgr()->OnDrawWidget(m_pNormalWidget.get(), pGS, &mt); } bool CXFA_FFCheckButton::OnLButtonUp(uint32_t dwFlags, diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp index 2826589c90..e009ed6caa 100644 --- a/xfa/fxfa/cxfa_fffield.cpp +++ b/xfa/fxfa/cxfa_fffield.cpp @@ -76,8 +76,7 @@ void CXFA_FFField::RenderWidget(CXFA_Graphics* pGS, CFX_RectF rtWidget = m_pNormalWidget->GetWidgetRect(); CFX_Matrix mt(1, 0, 0, 1, rtWidget.left, rtWidget.top); mt.Concat(mtRotate); - GetApp()->GetWidgetMgrDelegate()->OnDrawWidget(m_pNormalWidget.get(), pGS, - &mt); + GetApp()->GetWidgetMgr()->OnDrawWidget(m_pNormalWidget.get(), pGS, &mt); } void CXFA_FFField::DrawHighlight(CXFA_Graphics* pGS, @@ -737,7 +736,7 @@ bool CXFA_FFField::IsDataChanged() { } void CXFA_FFField::TranslateFWLMessage(CFWL_Message* pMessage) { - GetApp()->GetWidgetMgrDelegate()->OnProcessMessageToForm(pMessage); + GetApp()->GetWidgetMgr()->OnProcessMessageToForm(pMessage); } void CXFA_FFField::OnProcessMessage(CFWL_Message* pMessage) {} diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp index a0594c7853..17c1b9f8c8 100644 --- a/xfa/fxfa/cxfa_ffpushbutton.cpp +++ b/xfa/fxfa/cxfa_ffpushbutton.cpp @@ -44,8 +44,7 @@ void CXFA_FFPushButton::RenderWidget(CXFA_Graphics* pGS, CFX_RectF rtWidget = GetRectWithoutRotate(); CFX_Matrix mt(1, 0, 0, 1, rtWidget.left, rtWidget.top); mt.Concat(mtRotate); - GetApp()->GetWidgetMgrDelegate()->OnDrawWidget(m_pNormalWidget.get(), pGS, - &mt); + GetApp()->GetWidgetMgr()->OnDrawWidget(m_pNormalWidget.get(), pGS, &mt); } bool CXFA_FFPushButton::LoadWidget() { -- cgit v1.2.3