Rename CFWL_Widget::{Get,Set}FFWidget() to {Get,Set}AdapterIface().
Straight rename, no functional change.
Although a CXFA_FFWidget is a CFWL_Widget::AdapaterIface, this
interface exists solely so the fwl/ layer has no knowledge of FF
widgets, and hence method names shouldn't contain that term, either.
As a result, it becomes clearer why the result of one of these calls
needs to be cast to a CXFA_FFWidget by the upper layers, as applying
such a cast to a call named GetFFWidget() looked redundant.
Change-Id: Ifefc243503b04ff17105b40931cd12be0e7a1fc4
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/65457
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index 72844b9..2a80bd3 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -914,7 +914,7 @@
pRect->Offset(rtOuter.left, rtOuter.top);
}
- CFWL_Widget::AdapterIface* pXFAWidget = pOuter->GetFFWidget();
+ CFWL_Widget::AdapterIface* pXFAWidget = pOuter->GetAdapterIface();
if (!pXFAWidget)
return;
@@ -933,7 +933,7 @@
while (pOuter->GetOuter())
pOuter = pOuter->GetOuter();
- CFWL_Widget::AdapterIface* pXFAWidget = pOuter->GetFFWidget();
+ CFWL_Widget::AdapterIface* pXFAWidget = pOuter->GetAdapterIface();
if (!pXFAWidget)
return;
diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h
index cc6ee3b..a8112e8 100644
--- a/xfa/fwl/cfwl_widget.h
+++ b/xfa/fwl/cfwl_widget.h
@@ -127,9 +127,8 @@
uint32_t GetEventKey() const { return m_nEventKey; }
void SetEventKey(uint32_t key) { m_nEventKey = key; }
- AdapterIface* GetFFWidget() const { return m_pFFWidget; }
- void SetFFWidget(AdapterIface* pItem) { m_pFFWidget = pItem; }
-
+ AdapterIface* GetAdapterIface() const { return m_pAdapterIface; }
+ void SetAdapterIface(AdapterIface* pItem) { m_pAdapterIface = pItem; }
void RepaintRect(const CFX_RectF& pRect);
protected:
@@ -185,7 +184,7 @@
bool IsParent(CFWL_Widget* pParent);
uint32_t m_nEventKey = 0;
- AdapterIface* m_pFFWidget = nullptr;
+ AdapterIface* m_pAdapterIface = nullptr;
UnownedPtr<IFWL_WidgetDelegate> m_pDelegate;
};
diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp
index 434e9ff..cacdf09 100644
--- a/xfa/fwl/theme/cfwl_edittp.cpp
+++ b/xfa/fwl/theme/cfwl_edittp.cpp
@@ -20,7 +20,7 @@
void CFWL_EditTP::DrawBackground(const CFWL_ThemeBackground& pParams) {
if (CFWL_Part::CombTextLine == pParams.m_iPart) {
CFWL_Widget::AdapterIface* pWidget =
- pParams.m_pWidget->GetOutmost()->GetFFWidget();
+ pParams.m_pWidget->GetOutmost()->GetAdapterIface();
FX_ARGB cr = 0xFF000000;
float fWidth = 1.0f;
pWidget->GetBorderColorAndThickness(&cr, &fWidth);
diff --git a/xfa/fxfa/cxfa_ffbarcode.cpp b/xfa/fxfa/cxfa_ffbarcode.cpp
index 69646c2..1c541ec 100644
--- a/xfa/fxfa/cxfa_ffbarcode.cpp
+++ b/xfa/fxfa/cxfa_ffbarcode.cpp
@@ -143,7 +143,7 @@
auto pNew = pdfium::MakeUnique<CFWL_Barcode>(GetFWLApp());
CFWL_Barcode* pFWLBarcode = pNew.get();
SetNormalWidget(std::move(pNew));
- pFWLBarcode->SetFFWidget(this);
+ pFWLBarcode->SetAdapterIface(this);
CFWL_NoteDriver* pNoteDriver = pFWLBarcode->GetOwnerApp()->GetNoteDriver();
pNoteDriver->RegisterEventTarget(pFWLBarcode, pFWLBarcode);
diff --git a/xfa/fxfa/cxfa_ffcheckbutton.cpp b/xfa/fxfa/cxfa_ffcheckbutton.cpp
index bfa1c51..1d39e2f 100644
--- a/xfa/fxfa/cxfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/cxfa_ffcheckbutton.cpp
@@ -35,7 +35,7 @@
auto pNew = pdfium::MakeUnique<CFWL_CheckBox>(GetFWLApp());
CFWL_CheckBox* pCheckBox = pNew.get();
SetNormalWidget(std::move(pNew));
- pCheckBox->SetFFWidget(this);
+ pCheckBox->SetAdapterIface(this);
CFWL_NoteDriver* pNoteDriver = pCheckBox->GetOwnerApp()->GetNoteDriver();
pNoteDriver->RegisterEventTarget(pCheckBox, pCheckBox);
diff --git a/xfa/fxfa/cxfa_ffcombobox.cpp b/xfa/fxfa/cxfa_ffcombobox.cpp
index 935dc6d..61fa659 100644
--- a/xfa/fxfa/cxfa_ffcombobox.cpp
+++ b/xfa/fxfa/cxfa_ffcombobox.cpp
@@ -53,7 +53,7 @@
auto pNew = pdfium::MakeUnique<CFWL_ComboBox>(GetFWLApp());
CFWL_ComboBox* pComboBox = pNew.get();
SetNormalWidget(std::move(pNew));
- pComboBox->SetFFWidget(this);
+ pComboBox->SetAdapterIface(this);
CFWL_NoteDriver* pNoteDriver = pComboBox->GetOwnerApp()->GetNoteDriver();
pNoteDriver->RegisterEventTarget(pComboBox, pComboBox);
diff --git a/xfa/fxfa/cxfa_ffdatetimeedit.cpp b/xfa/fxfa/cxfa_ffdatetimeedit.cpp
index 84a58a1..d8d57f5 100644
--- a/xfa/fxfa/cxfa_ffdatetimeedit.cpp
+++ b/xfa/fxfa/cxfa_ffdatetimeedit.cpp
@@ -46,7 +46,7 @@
auto pNewPicker = pdfium::MakeUnique<CFWL_DateTimePicker>(GetFWLApp());
CFWL_DateTimePicker* pWidget = pNewPicker.get();
SetNormalWidget(std::move(pNewPicker));
- pWidget->SetFFWidget(this);
+ pWidget->SetAdapterIface(this);
CFWL_NoteDriver* pNoteDriver = pWidget->GetOwnerApp()->GetNoteDriver();
pNoteDriver->RegisterEventTarget(pWidget, pWidget);
diff --git a/xfa/fxfa/cxfa_ffimageedit.cpp b/xfa/fxfa/cxfa_ffimageedit.cpp
index 4ff46a9..60f584a 100644
--- a/xfa/fxfa/cxfa_ffimageedit.cpp
+++ b/xfa/fxfa/cxfa_ffimageedit.cpp
@@ -35,7 +35,7 @@
auto pNew = pdfium::MakeUnique<CFWL_PictureBox>(GetFWLApp());
CFWL_PictureBox* pPictureBox = pNew.get();
SetNormalWidget(std::move(pNew));
- pPictureBox->SetFFWidget(this);
+ pPictureBox->SetAdapterIface(this);
CFWL_NoteDriver* pNoteDriver = pPictureBox->GetOwnerApp()->GetNoteDriver();
pNoteDriver->RegisterEventTarget(pPictureBox, pPictureBox);
diff --git a/xfa/fxfa/cxfa_fflistbox.cpp b/xfa/fxfa/cxfa_fflistbox.cpp
index 1f53209..45162ee 100644
--- a/xfa/fxfa/cxfa_fflistbox.cpp
+++ b/xfa/fxfa/cxfa_fflistbox.cpp
@@ -45,7 +45,7 @@
pListBox->ModifyStyles(FWL_WGTSTYLE_VScroll | FWL_WGTSTYLE_NoBackground,
0xFFFFFFFF);
SetNormalWidget(std::move(pNew));
- pListBox->SetFFWidget(this);
+ pListBox->SetAdapterIface(this);
CFWL_NoteDriver* pNoteDriver = pListBox->GetOwnerApp()->GetNoteDriver();
pNoteDriver->RegisterEventTarget(pListBox, pListBox);
diff --git a/xfa/fxfa/cxfa_ffnumericedit.cpp b/xfa/fxfa/cxfa_ffnumericedit.cpp
index 86431fd..8d1b3bb 100644
--- a/xfa/fxfa/cxfa_ffnumericedit.cpp
+++ b/xfa/fxfa/cxfa_ffnumericedit.cpp
@@ -28,7 +28,7 @@
GetFWLApp(), pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr);
CFWL_Edit* pWidget = pNewEdit.get();
SetNormalWidget(std::move(pNewEdit));
- pWidget->SetFFWidget(this);
+ pWidget->SetAdapterIface(this);
CFWL_NoteDriver* pNoteDriver = pWidget->GetOwnerApp()->GetNoteDriver();
pNoteDriver->RegisterEventTarget(pWidget, pWidget);
diff --git a/xfa/fxfa/cxfa_ffpasswordedit.cpp b/xfa/fxfa/cxfa_ffpasswordedit.cpp
index b70d1d3..8019c5c 100644
--- a/xfa/fxfa/cxfa_ffpasswordedit.cpp
+++ b/xfa/fxfa/cxfa_ffpasswordedit.cpp
@@ -27,7 +27,7 @@
GetFWLApp(), pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr);
CFWL_Edit* pWidget = pNewEdit.get();
SetNormalWidget(std::move(pNewEdit));
- pWidget->SetFFWidget(this);
+ pWidget->SetAdapterIface(this);
CFWL_NoteDriver* pNoteDriver = pWidget->GetOwnerApp()->GetNoteDriver();
pNoteDriver->RegisterEventTarget(pWidget, pWidget);
diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp
index daf1aaa..7f2a06e 100644
--- a/xfa/fxfa/cxfa_ffpushbutton.cpp
+++ b/xfa/fxfa/cxfa_ffpushbutton.cpp
@@ -56,7 +56,7 @@
m_pOldDelegate = pPushButton->GetDelegate();
pPushButton->SetDelegate(this);
SetNormalWidget(std::move(pNew));
- pPushButton->SetFFWidget(this);
+ pPushButton->SetAdapterIface(this);
CFWL_NoteDriver* pNoteDriver = pPushButton->GetOwnerApp()->GetNoteDriver();
pNoteDriver->RegisterEventTarget(pPushButton, pPushButton);
diff --git a/xfa/fxfa/cxfa_fftextedit.cpp b/xfa/fxfa/cxfa_fftextedit.cpp
index c5c52b9..7b1c93b 100644
--- a/xfa/fxfa/cxfa_fftextedit.cpp
+++ b/xfa/fxfa/cxfa_fftextedit.cpp
@@ -48,7 +48,7 @@
ASSERT(!IsLoaded());
CFWL_Edit* pFWLEdit = pNewWidget.get();
SetNormalWidget(std::move(pNewWidget));
- pFWLEdit->SetFFWidget(this);
+ pFWLEdit->SetAdapterIface(this);
CFWL_NoteDriver* pNoteDriver = pFWLEdit->GetOwnerApp()->GetNoteDriver();
pNoteDriver->RegisterEventTarget(pFWLEdit, pFWLEdit);
diff --git a/xfa/fxfa/cxfa_fwladapterwidgetmgr.cpp b/xfa/fxfa/cxfa_fwladapterwidgetmgr.cpp
index ff8534d..a67bf08 100644
--- a/xfa/fxfa/cxfa_fwladapterwidgetmgr.cpp
+++ b/xfa/fxfa/cxfa_fwladapterwidgetmgr.cpp
@@ -17,7 +17,7 @@
if (!pWidget)
return;
- auto* pFFWidget = static_cast<CXFA_FFWidget*>(pWidget->GetFFWidget());
+ auto* pFFWidget = static_cast<CXFA_FFWidget*>(pWidget->GetAdapterIface());
if (!pFFWidget)
return;
@@ -29,7 +29,7 @@
float fMaxHeight,
const CFX_RectF& rtAnchor,
CFX_RectF* pPopupRect) {
- auto* pFFWidget = static_cast<CXFA_FFWidget*>(pWidget->GetFFWidget());
+ auto* pFFWidget = static_cast<CXFA_FFWidget*>(pWidget->GetAdapterIface());
CFX_RectF rtRotateAnchor =
pFFWidget->GetRotateMatrix().TransformRect(rtAnchor);
pFFWidget->GetDoc()->GetDocEnvironment()->GetPopupPos(
diff --git a/xfa/fxfa/cxfa_fwltheme.cpp b/xfa/fxfa/cxfa_fwltheme.cpp
index fd798b9..4c2c8da 100644
--- a/xfa/fxfa/cxfa_fwltheme.cpp
+++ b/xfa/fxfa/cxfa_fwltheme.cpp
@@ -39,7 +39,8 @@
CXFA_FFWidget* XFA_ThemeGetOuterWidget(CFWL_Widget* pWidget) {
CFWL_Widget* pOuter = pWidget ? pWidget->GetOutmost() : nullptr;
- return pOuter ? static_cast<CXFA_FFWidget*>(pOuter->GetFFWidget()) : nullptr;
+ return pOuter ? static_cast<CXFA_FFWidget*>(pOuter->GetAdapterIface())
+ : nullptr;
}
} // namespace
