Make |CXFA_FFField::m_pNormalWidget| private.
Add SetNormalWidget() to make this work.
Change-Id: Iabb4511b6edb6b0660314bd18e2d0a83c601c71f
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/62492
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/xfa/fxfa/cxfa_ffbarcode.cpp b/xfa/fxfa/cxfa_ffbarcode.cpp
index 31b0608..7663ee0 100644
--- a/xfa/fxfa/cxfa_ffbarcode.cpp
+++ b/xfa/fxfa/cxfa_ffbarcode.cpp
@@ -142,7 +142,7 @@
ASSERT(!IsLoaded());
auto pNew = pdfium::MakeUnique<CFWL_Barcode>(GetFWLApp());
CFWL_Barcode* pFWLBarcode = pNew.get();
- m_pNormalWidget = std::move(pNew);
+ SetNormalWidget(std::move(pNew));
pFWLBarcode->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver = pFWLBarcode->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_ffcheckbutton.cpp b/xfa/fxfa/cxfa_ffcheckbutton.cpp
index b9f1ef8..9d1467d 100644
--- a/xfa/fxfa/cxfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/cxfa_ffcheckbutton.cpp
@@ -34,7 +34,7 @@
ASSERT(!IsLoaded());
auto pNew = pdfium::MakeUnique<CFWL_CheckBox>(GetFWLApp());
CFWL_CheckBox* pCheckBox = pNew.get();
- m_pNormalWidget = std::move(pNew);
+ SetNormalWidget(std::move(pNew));
pCheckBox->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver = pCheckBox->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_ffcombobox.cpp b/xfa/fxfa/cxfa_ffcombobox.cpp
index 5c5e5a0..38203b1 100644
--- a/xfa/fxfa/cxfa_ffcombobox.cpp
+++ b/xfa/fxfa/cxfa_ffcombobox.cpp
@@ -48,7 +48,7 @@
ASSERT(!IsLoaded());
auto pNew = pdfium::MakeUnique<CFWL_ComboBox>(GetFWLApp());
CFWL_ComboBox* pComboBox = pNew.get();
- m_pNormalWidget = std::move(pNew);
+ SetNormalWidget(std::move(pNew));
pComboBox->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver = pComboBox->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_ffdatetimeedit.cpp b/xfa/fxfa/cxfa_ffdatetimeedit.cpp
index d324e66..45f9b9f 100644
--- a/xfa/fxfa/cxfa_ffdatetimeedit.cpp
+++ b/xfa/fxfa/cxfa_ffdatetimeedit.cpp
@@ -44,7 +44,7 @@
ASSERT(!IsLoaded());
auto pNewPicker = pdfium::MakeUnique<CFWL_DateTimePicker>(GetFWLApp());
CFWL_DateTimePicker* pWidget = pNewPicker.get();
- m_pNormalWidget = std::move(pNewPicker);
+ SetNormalWidget(std::move(pNewPicker));
pWidget->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver = pWidget->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp
index 67fd590..5828f69 100644
--- a/xfa/fxfa/cxfa_fffield.cpp
+++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -136,6 +136,10 @@
return m_pNormalWidget.get();
}
+void CXFA_FFField::SetNormalWidget(std::unique_ptr<CFWL_Widget> widget) {
+ m_pNormalWidget = std::move(widget);
+}
+
bool CXFA_FFField::IsLoaded() {
return GetNormalWidget() && CXFA_FFWidget::IsLoaded();
}
diff --git a/xfa/fxfa/cxfa_fffield.h b/xfa/fxfa/cxfa_fffield.h
index d885859..2f7b290 100644
--- a/xfa/fxfa/cxfa_fffield.h
+++ b/xfa/fxfa/cxfa_fffield.h
@@ -73,6 +73,7 @@
void SetFWLThemeProvider();
CFWL_Widget* GetNormalWidget();
const CFWL_Widget* GetNormalWidget() const;
+ void SetNormalWidget(std::unique_ptr<CFWL_Widget> widget);
CFX_PointF FWLToClient(const CFX_PointF& point);
void LayoutCaption();
void RenderCaption(CXFA_Graphics* pGS, CFX_Matrix* pMatrix);
@@ -97,9 +98,11 @@
XFA_AttributeValue iCapPlacement);
void SetEditScrollOffset();
- std::unique_ptr<CFWL_Widget> m_pNormalWidget;
CFX_RectF m_rtUI;
CFX_RectF m_rtCaption;
+
+ private:
+ std::unique_ptr<CFWL_Widget> m_pNormalWidget;
};
#endif // XFA_FXFA_CXFA_FFFIELD_H_
diff --git a/xfa/fxfa/cxfa_ffimageedit.cpp b/xfa/fxfa/cxfa_ffimageedit.cpp
index 5641932..1660f33 100644
--- a/xfa/fxfa/cxfa_ffimageedit.cpp
+++ b/xfa/fxfa/cxfa_ffimageedit.cpp
@@ -34,7 +34,7 @@
ASSERT(!IsLoaded());
auto pNew = pdfium::MakeUnique<CFWL_PictureBox>(GetFWLApp());
CFWL_PictureBox* pPictureBox = pNew.get();
- m_pNormalWidget = std::move(pNew);
+ SetNormalWidget(std::move(pNew));
pPictureBox->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver = pPictureBox->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_fflistbox.cpp b/xfa/fxfa/cxfa_fflistbox.cpp
index fc4ec69..a3e288e 100644
--- a/xfa/fxfa/cxfa_fflistbox.cpp
+++ b/xfa/fxfa/cxfa_fflistbox.cpp
@@ -44,7 +44,7 @@
CFWL_ListBox* pListBox = pNew.get();
pListBox->ModifyStyles(FWL_WGTSTYLE_VScroll | FWL_WGTSTYLE_NoBackground,
0xFFFFFFFF);
- m_pNormalWidget = std::move(pNew);
+ SetNormalWidget(std::move(pNew));
pListBox->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver = pListBox->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_ffnumericedit.cpp b/xfa/fxfa/cxfa_ffnumericedit.cpp
index ab8d67c..7765e3f 100644
--- a/xfa/fxfa/cxfa_ffnumericedit.cpp
+++ b/xfa/fxfa/cxfa_ffnumericedit.cpp
@@ -27,7 +27,7 @@
auto pNewEdit = pdfium::MakeUnique<CFWL_Edit>(
GetFWLApp(), pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr);
CFWL_Edit* pWidget = pNewEdit.get();
- m_pNormalWidget = std::move(pNewEdit);
+ SetNormalWidget(std::move(pNewEdit));
pWidget->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver = pWidget->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_ffpasswordedit.cpp b/xfa/fxfa/cxfa_ffpasswordedit.cpp
index 7691631..1724e7a 100644
--- a/xfa/fxfa/cxfa_ffpasswordedit.cpp
+++ b/xfa/fxfa/cxfa_ffpasswordedit.cpp
@@ -26,7 +26,7 @@
auto pNewEdit = pdfium::MakeUnique<CFWL_Edit>(
GetFWLApp(), pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr);
CFWL_Edit* pWidget = pNewEdit.get();
- m_pNormalWidget = std::move(pNewEdit);
+ SetNormalWidget(std::move(pNewEdit));
pWidget->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver = pWidget->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp
index 1b09f60..6d8ed7e 100644
--- a/xfa/fxfa/cxfa_ffpushbutton.cpp
+++ b/xfa/fxfa/cxfa_ffpushbutton.cpp
@@ -55,7 +55,7 @@
CFWL_PushButton* pPushButton = pNew.get();
m_pOldDelegate = pPushButton->GetDelegate();
pPushButton->SetDelegate(this);
- m_pNormalWidget = std::move(pNew);
+ SetNormalWidget(std::move(pNew));
pPushButton->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver = pPushButton->GetOwnerApp()->GetNoteDriver();
diff --git a/xfa/fxfa/cxfa_fftextedit.cpp b/xfa/fxfa/cxfa_fftextedit.cpp
index b5f2f87..d34e943 100644
--- a/xfa/fxfa/cxfa_fftextedit.cpp
+++ b/xfa/fxfa/cxfa_fftextedit.cpp
@@ -46,7 +46,7 @@
GetFWLApp(), pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr);
ASSERT(!IsLoaded());
CFWL_Edit* pFWLEdit = pNewWidget.get();
- m_pNormalWidget = std::move(pNewWidget);
+ SetNormalWidget(std::move(pNewWidget));
pFWLEdit->SetFFWidget(this);
CFWL_NoteDriver* pNoteDriver = pFWLEdit->GetOwnerApp()->GetNoteDriver();
