From 7322343b9322b93d97077575f95a00dcca3f0451 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 28 Apr 2016 10:51:13 -0700 Subject: More FWL interface cleanup. This CL merges the IFWL_Target class into IFWL_Widget and IFWL_Thread into IFWL_App. The IFWL_WidgetMgrDelegate, IFWL_NoteDriver and IFWL_NotThread are removed in favour of their concrete classes. Review-Url: https://codereview.chromium.org/1921853006 --- xfa/fxfa/app/xfa_ffapp.cpp | 4 ++-- xfa/fxfa/app/xfa_ffbarcode.cpp | 4 ++-- xfa/fxfa/app/xfa_ffcheckbutton.cpp | 6 +++--- xfa/fxfa/app/xfa_ffchoicelist.cpp | 8 ++++---- xfa/fxfa/app/xfa_ffdoc.cpp | 2 +- xfa/fxfa/app/xfa_fffield.cpp | 6 ++---- xfa/fxfa/app/xfa_ffimageedit.cpp | 4 ++-- xfa/fxfa/app/xfa_ffpushbutton.cpp | 8 ++++---- xfa/fxfa/app/xfa_fftextedit.cpp | 12 ++++++------ xfa/fxfa/app/xfa_fwltheme.h | 3 +-- xfa/fxfa/include/xfa_ffapp.h | 6 +++--- 11 files changed, 30 insertions(+), 33 deletions(-) (limited to 'xfa/fxfa') diff --git a/xfa/fxfa/app/xfa_ffapp.cpp b/xfa/fxfa/app/xfa_ffapp.cpp index 987b3e8efd..de63dc4934 100644 --- a/xfa/fxfa/app/xfa_ffapp.cpp +++ b/xfa/fxfa/app/xfa_ffapp.cpp @@ -9,7 +9,7 @@ #include #include "xfa/fgas/font/fgas_stdfontmgr.h" -#include "xfa/fwl/core/ifwl_widgetmgrdelegate.h" +#include "xfa/fwl/core/fwl_widgetmgrimp.h" #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_fwltheme.h" #include "xfa/fxfa/include/xfa_ffdoc.h" @@ -160,7 +160,7 @@ CXFA_FWLTheme* CXFA_FFApp::GetFWLTheme() { return m_pFWLTheme; } IFWL_AdapterWidgetMgr* CXFA_FFApp::GetWidgetMgr( - IFWL_WidgetMgrDelegate* pDelegate) { + CFWL_WidgetMgrDelegate* pDelegate) { if (!m_pAdapterWidgetMgr) { m_pAdapterWidgetMgr = new CXFA_FWLAdapterWidgetMgr; pDelegate->OnSetCapability(FWL_WGTMGR_DisableThread | diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp index b4608a349e..a659e13c55 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.cpp +++ b/xfa/fxfa/app/xfa_ffbarcode.cpp @@ -7,8 +7,8 @@ #include "xfa/fxfa/app/xfa_ffbarcode.h" #include "core/fxcrt/include/fx_ext.h" +#include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_app.h" -#include "xfa/fwl/core/ifwl_notedriver.h" #include "xfa/fwl/lightwidget/cfwl_barcode.h" #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_fftextedit.h" @@ -128,7 +128,7 @@ FX_BOOL CXFA_FFBarcode::LoadWidget() { m_pNormalWidget = pFWLBarcode; IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); m_pNormalWidget->SetPrivateData(pWidget, this, NULL); - IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); + CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); m_pOldDelegate = m_pNormalWidget->SetDelegate(this); m_pNormalWidget->LockUpdate(); diff --git a/xfa/fxfa/app/xfa_ffcheckbutton.cpp b/xfa/fxfa/app/xfa_ffcheckbutton.cpp index 4527afef7d..11deff1186 100644 --- a/xfa/fxfa/app/xfa_ffcheckbutton.cpp +++ b/xfa/fxfa/app/xfa_ffcheckbutton.cpp @@ -7,8 +7,8 @@ #include "xfa/fxfa/app/xfa_ffcheckbutton.h" #include "xfa/fwl/core/cfwl_message.h" -#include "xfa/fwl/core/ifwl_notedriver.h" -#include "xfa/fwl/core/ifwl_widgetmgrdelegate.h" +#include "xfa/fwl/core/fwl_noteimp.h" +#include "xfa/fwl/core/fwl_widgetmgrimp.h" #include "xfa/fwl/lightwidget/cfwl_checkbox.h" #include "xfa/fxfa/app/xfa_ffexclgroup.h" #include "xfa/fxfa/app/xfa_fffield.h" @@ -30,7 +30,7 @@ FX_BOOL CXFA_FFCheckButton::LoadWidget() { m_pNormalWidget = pCheckBox; IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); m_pNormalWidget->SetPrivateData(pWidget, this, NULL); - IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); + CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); m_pOldDelegate = m_pNormalWidget->SetDelegate(this); if (m_pDataAcc->IsRadioButton()) { diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp index cfd78c2035..6bb7c0bedb 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.cpp +++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp @@ -7,8 +7,8 @@ #include "xfa/fxfa/app/xfa_ffchoicelist.h" #include "xfa/fwl/basewidget/ifwl_edit.h" +#include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_app.h" -#include "xfa/fwl/core/ifwl_notedriver.h" #include "xfa/fwl/lightwidget/cfwl_combobox.h" #include "xfa/fwl/lightwidget/cfwl_listbox.h" #include "xfa/fxfa/app/xfa_fffield.h" @@ -24,7 +24,7 @@ CXFA_FFListBox::CXFA_FFListBox(CXFA_FFPageView* pPageView, CXFA_FFListBox::~CXFA_FFListBox() { if (m_pNormalWidget) { IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); - IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); + CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->UnregisterEventTarget(pWidget); } } @@ -36,7 +36,7 @@ FX_BOOL CXFA_FFListBox::LoadWidget() { m_pNormalWidget = (CFWL_Widget*)pListBox; IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); m_pNormalWidget->SetPrivateData(pWidget, this, NULL); - IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); + CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); m_pOldDelegate = m_pNormalWidget->SetDelegate(this); m_pNormalWidget->LockUpdate(); @@ -232,7 +232,7 @@ FX_BOOL CXFA_FFComboBox::LoadWidget() { m_pNormalWidget = (CFWL_Widget*)pComboBox; IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); m_pNormalWidget->SetPrivateData(pWidget, this, NULL); - IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); + CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); m_pOldDelegate = m_pNormalWidget->SetDelegate(this); m_pNormalWidget->LockUpdate(); diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp index 12e562cdfb..f33e4e0585 100644 --- a/xfa/fxfa/app/xfa_ffdoc.cpp +++ b/xfa/fxfa/app/xfa_ffdoc.cpp @@ -15,7 +15,7 @@ #include "core/fxcrt/include/fx_memory.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fgas/crt/fgas_algorithm.h" -#include "xfa/fwl/core/ifwl_notedriver.h" +#include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/include/xfa_checksum.h" #include "xfa/fxfa/include/xfa_ffapp.h" diff --git a/xfa/fxfa/app/xfa_fffield.cpp b/xfa/fxfa/app/xfa_fffield.cpp index b48893a1fc..d19bb4cf37 100644 --- a/xfa/fxfa/app/xfa_fffield.cpp +++ b/xfa/fxfa/app/xfa_fffield.cpp @@ -8,7 +8,7 @@ #include "xfa/fwl/basewidget/ifwl_edit.h" #include "xfa/fwl/core/cfwl_message.h" -#include "xfa/fwl/core/ifwl_widgetmgrdelegate.h" +#include "xfa/fwl/core/fwl_widgetmgrimp.h" #include "xfa/fwl/lightwidget/cfwl_edit.h" #include "xfa/fwl/lightwidget/cfwl_picturebox.h" #include "xfa/fxfa/app/xfa_fwltheme.h" @@ -334,10 +334,8 @@ void CXFA_FFField::SetFWLRect() { return; } CFX_RectF rtUi = m_rtUI; - if (rtUi.width < 1.0) { - ASSERT(rtUi.width < 1.0); + if (rtUi.width < 1.0) rtUi.width = 1.0; - } if (!m_pDataAcc->GetDoc()->GetXFADoc()->IsInteractive()) { FX_FLOAT fFontSize = m_pDataAcc->GetFontSize(); if (rtUi.height < fFontSize) { diff --git a/xfa/fxfa/app/xfa_ffimageedit.cpp b/xfa/fxfa/app/xfa_ffimageedit.cpp index 909f7e31f0..94cafba740 100644 --- a/xfa/fxfa/app/xfa_ffimageedit.cpp +++ b/xfa/fxfa/app/xfa_ffimageedit.cpp @@ -7,8 +7,8 @@ #include "xfa/fxfa/app/xfa_ffimageedit.h" #include "xfa/fwl/core/cfwl_message.h" +#include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_app.h" -#include "xfa/fwl/core/ifwl_notedriver.h" #include "xfa/fwl/lightwidget/cfwl_picturebox.h" #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/include/xfa_ffdoc.h" @@ -30,7 +30,7 @@ FX_BOOL CXFA_FFImageEdit::LoadWidget() { m_pNormalWidget = (CFWL_Widget*)pPictureBox; IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); m_pNormalWidget->SetPrivateData(pWidget, this, NULL); - IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); + CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); m_pOldDelegate = pPictureBox->SetDelegate(this); CXFA_FFField::LoadWidget(); diff --git a/xfa/fxfa/app/xfa_ffpushbutton.cpp b/xfa/fxfa/app/xfa_ffpushbutton.cpp index 6136fd3ce8..3893bc29fb 100644 --- a/xfa/fxfa/app/xfa_ffpushbutton.cpp +++ b/xfa/fxfa/app/xfa_ffpushbutton.cpp @@ -6,8 +6,8 @@ #include "xfa/fxfa/app/xfa_ffpushbutton.h" -#include "xfa/fwl/core/ifwl_notedriver.h" -#include "xfa/fwl/core/ifwl_widgetmgrdelegate.h" +#include "xfa/fwl/core/fwl_noteimp.h" +#include "xfa/fwl/core/fwl_widgetmgrimp.h" #include "xfa/fwl/lightwidget/cfwl_pushbutton.h" #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_ffwidgetacc.h" @@ -52,7 +52,7 @@ void CXFA_FFPushButton::RenderWidget(CFX_Graphics* pGS, pGS, &mt); } FX_BOOL CXFA_FFPushButton::LoadWidget() { - ASSERT(m_pNormalWidget == NULL); + ASSERT(!m_pNormalWidget); CFWL_PushButton* pPushButton = CFWL_PushButton::Create(); if (pPushButton) { pPushButton->Initialize(); @@ -61,7 +61,7 @@ FX_BOOL CXFA_FFPushButton::LoadWidget() { m_pNormalWidget = (CFWL_Widget*)pPushButton; IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); m_pNormalWidget->SetPrivateData(pWidget, this, NULL); - IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); + CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); m_pNormalWidget->LockUpdate(); UpdateWidgetProperty(); diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp index baa1d8aca6..e978e30bcf 100644 --- a/xfa/fxfa/app/xfa_fftextedit.cpp +++ b/xfa/fxfa/app/xfa_fftextedit.cpp @@ -11,7 +11,7 @@ #include "xfa/fwl/basewidget/ifwl_datetimepicker.h" #include "xfa/fwl/basewidget/ifwl_edit.h" #include "xfa/fwl/core/cfwl_message.h" -#include "xfa/fwl/core/ifwl_notedriver.h" +#include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/lightwidget/cfwl_datetimepicker.h" #include "xfa/fwl/lightwidget/cfwl_edit.h" #include "xfa/fxfa/app/xfa_fffield.h" @@ -30,7 +30,7 @@ CXFA_FFTextEdit::CXFA_FFTextEdit(CXFA_FFPageView* pPageView, CXFA_FFTextEdit::~CXFA_FFTextEdit() { if (m_pNormalWidget) { IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); - IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); + CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->UnregisterEventTarget(pWidget); } } @@ -40,7 +40,7 @@ FX_BOOL CXFA_FFTextEdit::LoadWidget() { m_pNormalWidget = pFWLEdit; IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); m_pNormalWidget->SetPrivateData(pWidget, this, NULL); - IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); + CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); m_pOldDelegate = m_pNormalWidget->SetDelegate(this); m_pNormalWidget->LockUpdate(); @@ -449,7 +449,7 @@ FX_BOOL CXFA_FFNumericEdit::LoadWidget() { m_pNormalWidget = (CFWL_Widget*)pWidget; IFWL_Widget* pIWidget = m_pNormalWidget->GetWidget(); m_pNormalWidget->SetPrivateData(pIWidget, this, NULL); - IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); + CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pIWidget, pIWidget); m_pOldDelegate = m_pNormalWidget->SetDelegate(this); m_pNormalWidget->LockUpdate(); @@ -523,7 +523,7 @@ FX_BOOL CXFA_FFPasswordEdit::LoadWidget() { m_pNormalWidget = (CFWL_Widget*)pWidget; IFWL_Widget* pIWidget = m_pNormalWidget->GetWidget(); m_pNormalWidget->SetPrivateData(pIWidget, this, NULL); - IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); + CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pIWidget, pIWidget); m_pOldDelegate = m_pNormalWidget->SetDelegate(this); m_pNormalWidget->LockUpdate(); @@ -589,7 +589,7 @@ FX_BOOL CXFA_FFDateTimeEdit::LoadWidget() { m_pNormalWidget = (CFWL_Widget*)pWidget; IFWL_Widget* pIWidget = m_pNormalWidget->GetWidget(); m_pNormalWidget->SetPrivateData(pIWidget, this, NULL); - IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); + CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pIWidget, pIWidget); m_pOldDelegate = m_pNormalWidget->SetDelegate(this); m_pNormalWidget->LockUpdate(); diff --git a/xfa/fxfa/app/xfa_fwltheme.h b/xfa/fxfa/app/xfa_fwltheme.h index 75885a5a9e..ae95637c8d 100644 --- a/xfa/fxfa/app/xfa_fwltheme.h +++ b/xfa/fxfa/app/xfa_fwltheme.h @@ -7,7 +7,6 @@ #ifndef XFA_FXFA_APP_XFA_FWLTHEME_H_ #define XFA_FXFA_APP_XFA_FWLTHEME_H_ -#include "xfa/fwl/core/ifwl_target.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #include "xfa/fwl/theme/cfwl_barcodetp.h" #include "xfa/fwl/theme/cfwl_carettp.h" @@ -31,7 +30,7 @@ class CXFA_FWLTheme : public IFWL_ThemeProvider { delete this; return FWL_ERR_Succeeded; } - virtual IFWL_Target* Retain() { return NULL; } + virtual IFWL_Widget* Retain() { return NULL; } virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const { return FWL_ERR_Succeeded; } diff --git a/xfa/fxfa/include/xfa_ffapp.h b/xfa/fxfa/include/xfa_ffapp.h index 8ecc89df13..774bebb06d 100644 --- a/xfa/fxfa/include/xfa_ffapp.h +++ b/xfa/fxfa/include/xfa_ffapp.h @@ -49,14 +49,14 @@ class CXFA_FFApp : public IFWL_AdapterNative { // IFWL_AdapterNative: IFWL_AdapterWidgetMgr* GetWidgetMgr( - IFWL_WidgetMgrDelegate* pDelegate) override; + CFWL_WidgetMgrDelegate* pDelegate) override; IFWL_AdapterThreadMgr* GetThreadMgr() override; IFWL_AdapterTimerMgr* GetTimerMgr() override; CXFA_FontMgr* GetXFAFontMgr(); IFX_FontMgr* GetFDEFontMgr(); CXFA_FWLTheme* GetFWLTheme(); - IFWL_WidgetMgrDelegate* GetWidgetMgrDelegate() { + CFWL_WidgetMgrDelegate* GetWidgetMgrDelegate() { return m_pWidgetMgrDelegate; } @@ -70,7 +70,7 @@ class CXFA_FFApp : public IFWL_AdapterNative { CFX_FontSourceEnum_File* m_pFontSource; #endif CXFA_FWLAdapterWidgetMgr* m_pAdapterWidgetMgr; - IFWL_WidgetMgrDelegate* m_pWidgetMgrDelegate; + CFWL_WidgetMgrDelegate* m_pWidgetMgrDelegate; IFX_FontMgr* m_pFDEFontMgr; CFWL_SDAdapterThreadMgr* m_pAdapterThreadMgr; }; -- cgit v1.2.3