Rename CFWL_Widget::{Set,Get}LayoutItem() to {Set,Get}FFWidget()
At one time, a FF widget was a layout item subclass, so the naming
was ok in the past. But as of 22ae151, they are no longer related by
inheritance, so we pick better names.
- Straight rename, no functional change.
Change-Id: I4cefa0d1873ab0ead1417c1ccc0bd68af1ab0779
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/54191
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index 3256c89..fcd4159 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -907,7 +907,7 @@
pRect->Offset(rtOuter.left, rtOuter.top);
}
- CXFA_FFWidget* pXFAWidget = pOuter->GetLayoutItem();
+ CXFA_FFWidget* pXFAWidget = pOuter->GetFFWidget();
if (!pXFAWidget)
return;
@@ -931,7 +931,7 @@
while (pOuter->GetOuter())
pOuter = pOuter->GetOuter();
- CXFA_FFWidget* pXFAWidget = pOuter->GetLayoutItem();
+ CXFA_FFWidget* pXFAWidget = pOuter->GetFFWidget();
if (!pXFAWidget)
return;
diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h
index a1fbf62..0fe8e4c 100644
--- a/xfa/fwl/cfwl_widget.h
+++ b/xfa/fwl/cfwl_widget.h
@@ -114,8 +114,8 @@
uint32_t GetEventKey() const { return m_nEventKey; }
void SetEventKey(uint32_t key) { m_nEventKey = key; }
- CXFA_FFWidget* GetLayoutItem() const { return m_pLayoutItem; }
- void SetLayoutItem(CXFA_FFWidget* pItem) { m_pLayoutItem = pItem; }
+ CXFA_FFWidget* GetFFWidget() const { return m_pFFWidget; }
+ void SetFFWidget(CXFA_FFWidget* pItem) { m_pFFWidget = pItem; }
void RepaintRect(const CFX_RectF& pRect);
@@ -166,7 +166,7 @@
bool IsParent(CFWL_Widget* pParent);
uint32_t m_nEventKey = 0;
- CXFA_FFWidget* m_pLayoutItem = nullptr;
+ CXFA_FFWidget* m_pFFWidget = nullptr;
UnownedPtr<IFWL_WidgetDelegate> m_pDelegate;
};
diff --git a/xfa/fxfa/cxfa_ffbarcode.cpp b/xfa/fxfa/cxfa_ffbarcode.cpp
index 7635877..0d813a6 100644
--- a/xfa/fxfa/cxfa_ffbarcode.cpp
+++ b/xfa/fxfa/cxfa_ffbarcode.cpp
@@ -117,7 +117,7 @@
auto pNew = pdfium::MakeUnique<CFWL_Barcode>(GetFWLApp());
CFWL_Barcode* pFWLBarcode = pNew.get();
m_pNormalWidget = std::move(pNew);
- m_pNormalWidget->SetLayoutItem(this);
+ m_pNormalWidget->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver =
m_pNormalWidget->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_ffcheckbutton.cpp b/xfa/fxfa/cxfa_ffcheckbutton.cpp
index 19d5a40..7156ee6 100644
--- a/xfa/fxfa/cxfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/cxfa_ffcheckbutton.cpp
@@ -34,7 +34,7 @@
auto pNew = pdfium::MakeUnique<CFWL_CheckBox>(GetFWLApp());
CFWL_CheckBox* pCheckBox = pNew.get();
m_pNormalWidget = std::move(pNew);
- m_pNormalWidget->SetLayoutItem(this);
+ m_pNormalWidget->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver =
m_pNormalWidget->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_ffcombobox.cpp b/xfa/fxfa/cxfa_ffcombobox.cpp
index 0d8c7e6..e943991 100644
--- a/xfa/fxfa/cxfa_ffcombobox.cpp
+++ b/xfa/fxfa/cxfa_ffcombobox.cpp
@@ -45,7 +45,7 @@
auto pNew = pdfium::MakeUnique<CFWL_ComboBox>(GetFWLApp());
CFWL_ComboBox* pComboBox = pNew.get();
m_pNormalWidget = std::move(pNew);
- m_pNormalWidget->SetLayoutItem(this);
+ m_pNormalWidget->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver =
m_pNormalWidget->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_ffdatetimeedit.cpp b/xfa/fxfa/cxfa_ffdatetimeedit.cpp
index 3a2d814..e38fae7 100644
--- a/xfa/fxfa/cxfa_ffdatetimeedit.cpp
+++ b/xfa/fxfa/cxfa_ffdatetimeedit.cpp
@@ -44,7 +44,7 @@
auto pNewPicker = pdfium::MakeUnique<CFWL_DateTimePicker>(GetFWLApp());
CFWL_DateTimePicker* pWidget = pNewPicker.get();
m_pNormalWidget = std::move(pNewPicker);
- m_pNormalWidget->SetLayoutItem(this);
+ m_pNormalWidget->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver =
m_pNormalWidget->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_ffimageedit.cpp b/xfa/fxfa/cxfa_ffimageedit.cpp
index 2a18cc9..ae683db 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();
m_pNormalWidget = std::move(pNew);
- m_pNormalWidget->SetLayoutItem(this);
+ m_pNormalWidget->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver =
m_pNormalWidget->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_fflistbox.cpp b/xfa/fxfa/cxfa_fflistbox.cpp
index b778b72..2fa9a7c 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);
m_pNormalWidget = std::move(pNew);
- m_pNormalWidget->SetLayoutItem(this);
+ m_pNormalWidget->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver =
m_pNormalWidget->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_ffnumericedit.cpp b/xfa/fxfa/cxfa_ffnumericedit.cpp
index 1f193f3..731c854 100644
--- a/xfa/fxfa/cxfa_ffnumericedit.cpp
+++ b/xfa/fxfa/cxfa_ffnumericedit.cpp
@@ -27,7 +27,7 @@
GetFWLApp(), pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr);
CFWL_Edit* pWidget = pNewEdit.get();
m_pNormalWidget = std::move(pNewEdit);
- m_pNormalWidget->SetLayoutItem(this);
+ m_pNormalWidget->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver =
m_pNormalWidget->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_ffpasswordedit.cpp b/xfa/fxfa/cxfa_ffpasswordedit.cpp
index 1a45f05..1ddef0e 100644
--- a/xfa/fxfa/cxfa_ffpasswordedit.cpp
+++ b/xfa/fxfa/cxfa_ffpasswordedit.cpp
@@ -26,7 +26,7 @@
GetFWLApp(), pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr);
CFWL_Edit* pWidget = pNewEdit.get();
m_pNormalWidget = std::move(pNewEdit);
- m_pNormalWidget->SetLayoutItem(this);
+ m_pNormalWidget->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver =
m_pNormalWidget->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp
index e8d55af..6b09ff4 100644
--- a/xfa/fxfa/cxfa_ffpushbutton.cpp
+++ b/xfa/fxfa/cxfa_ffpushbutton.cpp
@@ -55,7 +55,7 @@
m_pOldDelegate = pPushButton->GetDelegate();
pPushButton->SetDelegate(this);
m_pNormalWidget = std::move(pNew);
- m_pNormalWidget->SetLayoutItem(this);
+ m_pNormalWidget->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver =
m_pNormalWidget->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_fftextedit.cpp b/xfa/fxfa/cxfa_fftextedit.cpp
index 1e5055c..907ce99 100644
--- a/xfa/fxfa/cxfa_fftextedit.cpp
+++ b/xfa/fxfa/cxfa_fftextedit.cpp
@@ -47,7 +47,7 @@
GetFWLApp(), pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr);
CFWL_Edit* pFWLEdit = pNewWidget.get();
m_pNormalWidget = std::move(pNewWidget);
- m_pNormalWidget->SetLayoutItem(this);
+ m_pNormalWidget->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver =
m_pNormalWidget->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_fwladapterwidgetmgr.cpp b/xfa/fxfa/cxfa_fwladapterwidgetmgr.cpp
index 3d6b75b..3e25c73 100644
--- a/xfa/fxfa/cxfa_fwladapterwidgetmgr.cpp
+++ b/xfa/fxfa/cxfa_fwladapterwidgetmgr.cpp
@@ -17,7 +17,7 @@
if (!pWidget)
return;
- CXFA_FFWidget* pFFWidget = pWidget->GetLayoutItem();
+ CXFA_FFWidget* pFFWidget = pWidget->GetFFWidget();
if (!pFFWidget)
return;
@@ -29,7 +29,7 @@
float fMaxHeight,
const CFX_RectF& rtAnchor,
CFX_RectF* pPopupRect) {
- CXFA_FFWidget* pFFWidget = pWidget->GetLayoutItem();
+ CXFA_FFWidget* pFFWidget = pWidget->GetFFWidget();
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 4aab239..459e44d 100644
--- a/xfa/fxfa/cxfa_fwltheme.cpp
+++ b/xfa/fxfa/cxfa_fwltheme.cpp
@@ -42,7 +42,7 @@
CFWL_Widget* pOuter = pWidget;
while (pOuter && pOuter->GetOuter())
pOuter = pOuter->GetOuter();
- return pOuter ? pOuter->GetLayoutItem() : nullptr;
+ return pOuter ? pOuter->GetFFWidget() : nullptr;
}
CXFA_FWLTheme::CXFA_FWLTheme(CXFA_FFApp* pApp)
