Rename CFFL_FormFiller::GetPDFWindow() to GetPWLWindow().
Because it returns a PWL window (CPWL_Wnd). Do the same rename
for the other "PDFWindow" methods, execpt for GetPDFWindowRect,
which has nothing to to with PWL Windows, but rather the
dictionary associated with a PDF annot.
Change-Id: Iaa3607ff055b18dfd5f1de94ada0d0ea707a24e7
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/58850
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index 5ea5f03..05c00f7 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -717,20 +717,20 @@
float fHeight = rectAnnot.Height();
CPDF_FormControl* pControl = GetFormControl();
- CFX_FloatRect rcPDFWindow;
+ CFX_FloatRect rcPWLWindow;
switch (abs(pControl->GetRotation() % 360)) {
case 0:
case 180:
default:
- rcPDFWindow = CFX_FloatRect(0, 0, fWidth, fHeight);
+ rcPWLWindow = CFX_FloatRect(0, 0, fWidth, fHeight);
break;
case 90:
case 270:
- rcPDFWindow = CFX_FloatRect(0, 0, fHeight, fWidth);
+ rcPWLWindow = CFX_FloatRect(0, 0, fHeight, fWidth);
break;
}
- return rcPDFWindow;
+ return rcPWLWindow;
}
CFX_Matrix CPDFSDK_Widget::GetMatrix() const {
diff --git a/fpdfsdk/formfiller/cffl_checkbox.cpp b/fpdfsdk/formfiller/cffl_checkbox.cpp
index cb7ddd1..e0a11d2 100644
--- a/fpdfsdk/formfiller/cffl_checkbox.cpp
+++ b/fpdfsdk/formfiller/cffl_checkbox.cpp
@@ -129,5 +129,5 @@
CPWL_CheckBox* CFFL_CheckBox::GetCheckBox(CPDFSDK_PageView* pPageView,
bool bNew) {
- return static_cast<CPWL_CheckBox*>(GetPDFWindow(pPageView, bNew));
+ return static_cast<CPWL_CheckBox*>(GetPWLWindow(pPageView, bNew));
}
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp
index 38f7a42..cee4108 100644
--- a/fpdfsdk/formfiller/cffl_combobox.cpp
+++ b/fpdfsdk/formfiller/cffl_combobox.cpp
@@ -77,7 +77,7 @@
}
bool CFFL_ComboBox::IsDataChanged(CPDFSDK_PageView* pPageView) {
- auto* pWnd = static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false));
+ auto* pWnd = static_cast<CPWL_ComboBox*>(GetPWLWindow(pPageView, false));
if (!pWnd)
return false;
@@ -93,7 +93,7 @@
void CFFL_ComboBox::SaveData(CPDFSDK_PageView* pPageView) {
CPWL_ComboBox* pWnd =
- static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false));
+ static_cast<CPWL_ComboBox*>(GetPWLWindow(pPageView, false));
if (!pWnd)
return;
@@ -130,7 +130,7 @@
switch (type) {
case CPDF_AAction::kKeyStroke:
if (CPWL_ComboBox* pComboBox =
- static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false))) {
+ static_cast<CPWL_ComboBox*>(GetPWLWindow(pPageView, false))) {
if (CPWL_Edit* pEdit = pComboBox->GetEdit()) {
fa.bFieldFull = pEdit->IsTextFull();
int nSelStart = 0;
@@ -150,7 +150,7 @@
break;
case CPDF_AAction::kValidate:
if (CPWL_ComboBox* pComboBox =
- static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false))) {
+ static_cast<CPWL_ComboBox*>(GetPWLWindow(pPageView, false))) {
if (CPWL_Edit* pEdit = pComboBox->GetEdit()) {
fa.sValue = pEdit->GetText();
}
@@ -171,7 +171,7 @@
switch (type) {
case CPDF_AAction::kKeyStroke:
if (CPWL_ComboBox* pComboBox =
- static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false))) {
+ static_cast<CPWL_ComboBox*>(GetPWLWindow(pPageView, false))) {
if (CPWL_Edit* pEdit = pComboBox->GetEdit()) {
pEdit->SetSelection(fa.nSelStart, fa.nSelEnd);
pEdit->ReplaceSelection(fa.sChange);
@@ -202,7 +202,7 @@
ASSERT(pPageView);
if (CPWL_ComboBox* pComboBox =
- static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false))) {
+ static_cast<CPWL_ComboBox*>(GetPWLWindow(pPageView, false))) {
m_State.nIndex = pComboBox->GetSelect();
if (CPWL_Edit* pEdit = pComboBox->GetEdit()) {
@@ -216,7 +216,7 @@
ASSERT(pPageView);
if (CPWL_ComboBox* pComboBox =
- static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, true))) {
+ static_cast<CPWL_ComboBox*>(GetPWLWindow(pPageView, true))) {
if (m_State.nIndex >= 0) {
pComboBox->SetSelect(m_State.nIndex);
} else {
@@ -239,7 +239,7 @@
ASSERT(pPageView);
CPWL_ComboBox* pWnd =
- static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false));
+ static_cast<CPWL_ComboBox*>(GetPWLWindow(pPageView, false));
if (!pWnd)
return false;
@@ -258,7 +258,7 @@
ASSERT(pPageView);
CPWL_ComboBox* pWnd =
- static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false));
+ static_cast<CPWL_ComboBox*>(GetPWLWindow(pPageView, false));
if (!pWnd)
return false;
@@ -268,7 +268,7 @@
#ifdef PDF_ENABLE_XFA
bool CFFL_ComboBox::IsFieldFull(CPDFSDK_PageView* pPageView) {
if (CPWL_ComboBox* pComboBox =
- static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false))) {
+ static_cast<CPWL_ComboBox*>(GetPWLWindow(pPageView, false))) {
if (CPWL_Edit* pEdit = pComboBox->GetEdit())
return pEdit->IsTextFull();
}
@@ -291,7 +291,7 @@
WideString swRet;
CPDFSDK_PageView* pPageView = GetCurPageView(true);
- auto* pComboBox = static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false));
+ auto* pComboBox = static_cast<CPWL_ComboBox*>(GetPWLWindow(pPageView, false));
int nExport = pComboBox ? pComboBox->GetSelect() : -1;
if (nExport >= 0) {
diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index 279e9b1..08ef123 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -40,7 +40,7 @@
ASSERT(pPageView);
CFX_FloatRect rcAnnot = m_pWidget->GetRect();
- if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false))
+ if (CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false))
rcAnnot = PWLtoFFL(pWnd->GetWindowRect());
CFX_FloatRect rcWin = rcAnnot;
@@ -59,7 +59,7 @@
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
const CFX_Matrix& mtUser2Device) {
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
if (pWnd) {
pWnd->DrawAppearance(pDevice, GetCurMatrix() * mtUser2Device);
return;
@@ -91,7 +91,7 @@
CPDFSDK_Annot* pAnnot,
uint32_t nFlags,
const CFX_PointF& point) {
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, true);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, true);
if (!pWnd)
return false;
@@ -107,7 +107,7 @@
CPDFSDK_Annot* pAnnot,
uint32_t nFlags,
const CFX_PointF& point) {
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
if (!pWnd)
return false;
@@ -119,7 +119,7 @@
bool CFFL_FormFiller::OnLButtonDblClk(CPDFSDK_PageView* pPageView,
uint32_t nFlags,
const CFX_PointF& point) {
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
if (!pWnd)
return false;
@@ -130,7 +130,7 @@
bool CFFL_FormFiller::OnMouseMove(CPDFSDK_PageView* pPageView,
uint32_t nFlags,
const CFX_PointF& point) {
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
if (!pWnd)
return false;
@@ -145,14 +145,14 @@
if (!IsValid())
return false;
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, true);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, true);
return pWnd && pWnd->OnMouseWheel(zDelta, WndtoPWL(pPageView, point), nFlags);
}
bool CFFL_FormFiller::OnRButtonDown(CPDFSDK_PageView* pPageView,
uint32_t nFlags,
const CFX_PointF& point) {
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, true);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, true);
if (!pWnd)
return false;
@@ -163,7 +163,7 @@
bool CFFL_FormFiller::OnRButtonUp(CPDFSDK_PageView* pPageView,
uint32_t nFlags,
const CFX_PointF& point) {
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
if (!pWnd)
return false;
@@ -178,7 +178,7 @@
CPDFSDK_PageView* pPageView = GetCurPageView(true);
ASSERT(pPageView);
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
return pWnd && pWnd->OnKeyDown(nKeyCode, nFlags);
}
@@ -191,7 +191,7 @@
CPDFSDK_PageView* pPageView = GetCurPageView(true);
ASSERT(pPageView);
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
return pWnd && pWnd->OnChar(nChar, nFlags);
}
@@ -210,7 +210,7 @@
CPDFSDK_PageView* pPageView = GetCurPageView(true);
ASSERT(pPageView);
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
return pWnd ? pWnd->GetText() : WideString();
}
@@ -221,7 +221,7 @@
CPDFSDK_PageView* pPageView = GetCurPageView(true);
ASSERT(pPageView);
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
return pWnd ? pWnd->GetSelectedText() : WideString();
}
@@ -232,7 +232,7 @@
CPDFSDK_PageView* pPageView = GetCurPageView(true);
ASSERT(pPageView);
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
if (!pWnd)
return;
@@ -246,7 +246,7 @@
CPDFSDK_PageView* pPageView = GetCurPageView(true);
ASSERT(pPageView);
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
return pWnd && pWnd->CanUndo();
}
@@ -257,7 +257,7 @@
CPDFSDK_PageView* pPageView = GetCurPageView(true);
ASSERT(pPageView);
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
return pWnd && pWnd->CanRedo();
}
@@ -268,7 +268,7 @@
CPDFSDK_PageView* pPageView = GetCurPageView(true);
ASSERT(pPageView);
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
return pWnd && pWnd->Undo();
}
@@ -279,7 +279,7 @@
CPDFSDK_PageView* pPageView = GetCurPageView(true);
ASSERT(pPageView);
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
return pWnd && pWnd->Redo();
}
@@ -287,7 +287,7 @@
CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot);
IPDF_Page* pPage = pWidget->GetPage();
CPDFSDK_PageView* pPageView = m_pFormFillEnv->GetPageView(pPage, true);
- if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, true))
+ if (CPWL_Wnd* pWnd = GetPWLWindow(pPageView, true))
pWnd->SetFocus();
m_bValid = true;
@@ -301,21 +301,21 @@
CPDFSDK_PageView* pPageView = GetCurPageView(false);
if (!pPageView || !CommitData(pPageView, nFlag))
return;
- if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false))
+ if (CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false))
pWnd->KillFocus();
- bool bDestroyPDFWindow;
+ bool bDestroyPWLWindow;
switch (m_pWidget->GetFieldType()) {
case FormFieldType::kPushButton:
case FormFieldType::kCheckBox:
case FormFieldType::kRadioButton:
- bDestroyPDFWindow = true;
+ bDestroyPWLWindow = true;
break;
default:
- bDestroyPDFWindow = false;
+ bDestroyPWLWindow = false;
break;
}
- EscapeFiller(pPageView, bDestroyPDFWindow);
+ EscapeFiller(pPageView, bDestroyPWLWindow);
}
bool CFFL_FormFiller::IsValid() const {
@@ -325,7 +325,7 @@
CPWL_Wnd::CreateParams CFFL_FormFiller::GetCreateParam() {
CPWL_Wnd::CreateParams cp;
cp.pProvider.Reset(this);
- cp.rcRectWnd = GetPDFWindowRect();
+ cp.rcRectWnd = GetPDFAnnotRect();
uint32_t dwCreateFlags = PWS_BORDER | PWS_BACKGROUND | PWS_VISIBLE;
uint32_t dwFieldFlag = m_pWidget->GetFieldFlags();
@@ -369,7 +369,7 @@
return cp;
}
-CPWL_Wnd* CFFL_FormFiller::GetPDFWindow(CPDFSDK_PageView* pPageView,
+CPWL_Wnd* CFFL_FormFiller::GetPWLWindow(CPDFSDK_PageView* pPageView,
bool bNew) {
ASSERT(pPageView);
auto it = m_Maps.find(pPageView);
@@ -396,11 +396,11 @@
if (pPrivateData->nWidgetAppearanceAge == m_pWidget->GetAppearanceAge())
return pWnd;
- return ResetPDFWindow(
+ return ResetPWLWindow(
pPageView, pPrivateData->nWidgetValueAge == m_pWidget->GetValueAge());
}
-void CFFL_FormFiller::DestroyPDFWindow(CPDFSDK_PageView* pPageView) {
+void CFFL_FormFiller::DestroyPWLWindow(CPDFSDK_PageView* pPageView) {
auto it = m_Maps.find(pPageView);
if (it == m_Maps.end())
return;
@@ -443,7 +443,7 @@
return mt;
}
-CFX_FloatRect CFFL_FormFiller::GetPDFWindowRect() const {
+CFX_FloatRect CFFL_FormFiller::GetPDFAnnotRect() const {
CFX_FloatRect rectAnnot = m_pWidget->GetPDFAnnot()->GetRect();
float fWidth = rectAnnot.Width();
@@ -459,7 +459,7 @@
}
CFX_FloatRect CFFL_FormFiller::GetFocusBox(CPDFSDK_PageView* pPageView) {
- CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false);
+ CPWL_Wnd* pWnd = GetPWLWindow(pPageView, false);
if (!pWnd)
return CFX_FloatRect();
@@ -505,7 +505,7 @@
if (!pFormFiller->OnKeyStrokeCommit(&pObserved, pPageView, nFlag)) {
if (!pObserved)
return false;
- ResetPDFWindow(pPageView, false);
+ ResetPWLWindow(pPageView, false);
return true;
}
if (!pObserved)
@@ -514,7 +514,7 @@
if (!pFormFiller->OnValidate(&pObserved, pPageView, nFlag)) {
if (!pObserved)
return false;
- ResetPDFWindow(pPageView, false);
+ ResetPWLWindow(pPageView, false);
return true;
}
if (!pObserved)
@@ -571,9 +571,9 @@
void CFFL_FormFiller::RestoreState(CPDFSDK_PageView* pPageView) {}
-CPWL_Wnd* CFFL_FormFiller::ResetPDFWindow(CPDFSDK_PageView* pPageView,
+CPWL_Wnd* CFFL_FormFiller::ResetPWLWindow(CPDFSDK_PageView* pPageView,
bool bRestoreValue) {
- return GetPDFWindow(pPageView, false);
+ return GetPWLWindow(pPageView, false);
}
void CFFL_FormFiller::OnTimerFired() {}
@@ -583,12 +583,12 @@
}
void CFFL_FormFiller::EscapeFiller(CPDFSDK_PageView* pPageView,
- bool bDestroyPDFWindow) {
+ bool bDestroyPWLWindow) {
m_bValid = false;
InvalidateRect(GetViewBBox(pPageView));
- if (bDestroyPDFWindow)
- DestroyPDFWindow(pPageView);
+ if (bDestroyPWLWindow)
+ DestroyPWLWindow(pPageView);
}
void CFFL_FormFiller::InvalidateRect(const FX_RECT& rect) {
diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h
index 3fbea81..39e281a 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.h
+++ b/fpdfsdk/formfiller/cffl_formfiller.h
@@ -107,7 +107,7 @@
virtual std::unique_ptr<CPWL_Wnd> NewPWLWindow(
const CPWL_Wnd::CreateParams& cp,
std::unique_ptr<IPWL_SystemHandler::PerWindowData> pAttachedData) = 0;
- virtual CPWL_Wnd* ResetPDFWindow(CPDFSDK_PageView* pPageView,
+ virtual CPWL_Wnd* ResetPWLWindow(CPDFSDK_PageView* pPageView,
bool bRestoreValue);
virtual void SaveState(CPDFSDK_PageView* pPageView);
virtual void RestoreState(CPDFSDK_PageView* pPageView);
@@ -130,12 +130,12 @@
virtual bool IsFieldFull(CPDFSDK_PageView* pPageView);
#endif // PDF_ENABLE_XFA
- CPWL_Wnd* GetPDFWindow(CPDFSDK_PageView* pPageView, bool bNew);
- void DestroyPDFWindow(CPDFSDK_PageView* pPageView);
- void EscapeFiller(CPDFSDK_PageView* pPageView, bool bDestroyPDFWindow);
+ CPWL_Wnd* GetPWLWindow(CPDFSDK_PageView* pPageView, bool bNew);
+ void DestroyPWLWindow(CPDFSDK_PageView* pPageView);
+ void EscapeFiller(CPDFSDK_PageView* pPageView, bool bDestroyPWLWindow);
bool IsValid() const;
- CFX_FloatRect GetPDFWindowRect() const;
+ CFX_FloatRect GetPDFAnnotRect() const;
CFX_SystemHandler* GetSystemHandler() const;
CPDFSDK_PageView* GetCurPageView(bool renew);
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
index 8550116..1f5a386 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
@@ -136,7 +136,7 @@
if (pWidget->IsAppModified()) {
if (CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget)) {
- pFormFiller->ResetPDFWindow(pPageView,
+ pFormFiller->ResetPWLWindow(pPageView,
pWidget->GetValueAge() == nValueAge);
}
}
@@ -169,7 +169,7 @@
if (pWidget->IsAppModified()) {
if (CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget)) {
- pFormFiller->ResetPDFWindow(pPageView,
+ pFormFiller->ResetPWLWindow(pPageView,
nValueAge == pWidget->GetValueAge());
}
}
@@ -208,7 +208,7 @@
if (pWidget->IsAppModified()) {
if (CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget)) {
- pFormFiller->ResetPDFWindow(pPageView,
+ pFormFiller->ResetPWLWindow(pPageView,
nValueAge == pWidget->GetValueAge());
}
}
@@ -285,7 +285,7 @@
CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget);
if (pFormFiller)
- pFormFiller->ResetPDFWindow(pPageView, nValueAge == pWidget->GetValueAge());
+ pFormFiller->ResetPWLWindow(pPageView, nValueAge == pWidget->GetValueAge());
return true;
}
@@ -410,7 +410,7 @@
if (pWidget->IsAppModified()) {
if (CFFL_FormFiller* pFiller = GetFormFiller(pWidget)) {
- pFiller->ResetPDFWindow(pPageView,
+ pFiller->ResetPWLWindow(pPageView,
nValueAge == pWidget->GetValueAge());
}
}
@@ -772,7 +772,7 @@
return false;
if (CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget))
- pFormFiller->ResetPDFWindow(pPageView, nValueAge == pWidget->GetValueAge());
+ pFormFiller->ResetPWLWindow(pPageView, nValueAge == pWidget->GetValueAge());
return false;
}
@@ -802,7 +802,7 @@
return false;
if (CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget))
- pFormFiller->ResetPDFWindow(pPageView, nValueAge == pWidget->GetValueAge());
+ pFormFiller->ResetPWLWindow(pPageView, nValueAge == pWidget->GetValueAge());
return true;
}
@@ -853,7 +853,7 @@
return false;
if (CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget))
- pFormFiller->ResetPDFWindow(pPageView, nValueAge == pWidget->GetValueAge());
+ pFormFiller->ResetPWLWindow(pPageView, nValueAge == pWidget->GetValueAge());
return true;
}
@@ -884,7 +884,7 @@
return false;
if (CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget))
- pFormFiller->ResetPDFWindow(pPageView, nValueAge == pWidget->GetValueAge());
+ pFormFiller->ResetPWLWindow(pPageView, nValueAge == pWidget->GetValueAge());
return true;
}
@@ -958,7 +958,7 @@
bool bExit = false;
if (nAge != privateData.pWidget->GetAppearanceAge()) {
- CPWL_Wnd* pWnd = pFormFiller->ResetPDFWindow(
+ CPWL_Wnd* pWnd = pFormFiller->ResetPWLWindow(
privateData.pPageView, nValueAge == privateData.pWidget->GetValueAge());
if (!pWnd)
return {true, true};
diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp
index 735791b..7f2999c 100644
--- a/fpdfsdk/formfiller/cffl_listbox.cpp
+++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -84,7 +84,7 @@
}
bool CFFL_ListBox::IsDataChanged(CPDFSDK_PageView* pPageView) {
- auto* pListBox = static_cast<CPWL_ListBox*>(GetPDFWindow(pPageView, false));
+ auto* pListBox = static_cast<CPWL_ListBox*>(GetPWLWindow(pPageView, false));
if (!pListBox)
return false;
@@ -106,7 +106,7 @@
void CFFL_ListBox::SaveData(CPDFSDK_PageView* pPageView) {
CPWL_ListBox* pListBox =
- static_cast<CPWL_ListBox*>(GetPDFWindow(pPageView, false));
+ static_cast<CPWL_ListBox*>(GetPWLWindow(pPageView, false));
if (!pListBox)
return;
@@ -149,7 +149,7 @@
fa.sValue.clear();
} else {
auto* pListBox =
- static_cast<CPWL_ListBox*>(GetPDFWindow(pPageView, false));
+ static_cast<CPWL_ListBox*>(GetPWLWindow(pPageView, false));
if (pListBox) {
int32_t nCurSel = pListBox->GetCurSel();
if (nCurSel >= 0)
@@ -176,7 +176,7 @@
ASSERT(pPageView);
CPWL_ListBox* pListBox =
- static_cast<CPWL_ListBox*>(GetPDFWindow(pPageView, false));
+ static_cast<CPWL_ListBox*>(GetPWLWindow(pPageView, false));
if (!pListBox)
return;
@@ -188,7 +188,7 @@
void CFFL_ListBox::RestoreState(CPDFSDK_PageView* pPageView) {
CPWL_ListBox* pListBox =
- static_cast<CPWL_ListBox*>(GetPDFWindow(pPageView, false));
+ static_cast<CPWL_ListBox*>(GetPWLWindow(pPageView, false));
if (!pListBox)
return;
@@ -207,7 +207,7 @@
ASSERT(pPageView);
CPWL_ListBox* pListBox =
- static_cast<CPWL_ListBox*>(GetPDFWindow(pPageView, false));
+ static_cast<CPWL_ListBox*>(GetPWLWindow(pPageView, false));
if (!pListBox)
return false;
@@ -233,7 +233,7 @@
ASSERT(pPageView);
CPWL_ListBox* pListBox =
- static_cast<CPWL_ListBox*>(GetPDFWindow(pPageView, false));
+ static_cast<CPWL_ListBox*>(GetPWLWindow(pPageView, false));
if (!pListBox)
return false;
diff --git a/fpdfsdk/formfiller/cffl_radiobutton.cpp b/fpdfsdk/formfiller/cffl_radiobutton.cpp
index e9a6f23..c03dd9f 100644
--- a/fpdfsdk/formfiller/cffl_radiobutton.cpp
+++ b/fpdfsdk/formfiller/cffl_radiobutton.cpp
@@ -118,5 +118,5 @@
CPWL_RadioButton* CFFL_RadioButton::GetRadioButton(CPDFSDK_PageView* pPageView,
bool bNew) {
- return static_cast<CPWL_RadioButton*>(GetPDFWindow(pPageView, bNew));
+ return static_cast<CPWL_RadioButton*>(GetPWLWindow(pPageView, bNew));
}
diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp
index c7689e5..592211b 100644
--- a/fpdfsdk/formfiller/cffl_textfield.cpp
+++ b/fpdfsdk/formfiller/cffl_textfield.cpp
@@ -107,7 +107,7 @@
pAnnot->GetRect().GetOuterRect());
if (m_bValid) {
- if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, true))
+ if (CPWL_Wnd* pWnd = GetPWLWindow(pPageView, true))
pWnd->SetFocus();
break;
}
@@ -115,7 +115,7 @@
if (!CommitData(pPageView, nFlags))
return false;
- DestroyPDFWindow(pPageView);
+ DestroyPWLWindow(pPageView);
return true;
}
case FWL_VKEY_Escape: {
@@ -260,5 +260,5 @@
}
CPWL_Edit* CFFL_TextField::GetEdit(CPDFSDK_PageView* pPageView, bool bNew) {
- return static_cast<CPWL_Edit*>(GetPDFWindow(pPageView, bNew));
+ return static_cast<CPWL_Edit*>(GetPWLWindow(pPageView, bNew));
}
diff --git a/fpdfsdk/formfiller/cffl_textobject.cpp b/fpdfsdk/formfiller/cffl_textobject.cpp
index 676d407..6845de1 100644
--- a/fpdfsdk/formfiller/cffl_textobject.cpp
+++ b/fpdfsdk/formfiller/cffl_textobject.cpp
@@ -7,16 +7,16 @@
#include "fpdfsdk/formfiller/cffl_textobject.h"
#include "third_party/base/ptr_util.h"
-CPWL_Wnd* CFFL_TextObject::ResetPDFWindow(CPDFSDK_PageView* pPageView,
+CPWL_Wnd* CFFL_TextObject::ResetPWLWindow(CPDFSDK_PageView* pPageView,
bool bRestoreValue) {
if (bRestoreValue)
SaveState(pPageView);
- DestroyPDFWindow(pPageView);
+ DestroyPWLWindow(pPageView);
if (bRestoreValue)
RestoreState(pPageView);
- ObservedPtr<CPWL_Wnd> pRet(GetPDFWindow(pPageView, !bRestoreValue));
+ ObservedPtr<CPWL_Wnd> pRet(GetPWLWindow(pPageView, !bRestoreValue));
m_pWidget->UpdateField(); // May invoke JS, invalidating |pRet|.
return pRet.Get();
}
diff --git a/fpdfsdk/formfiller/cffl_textobject.h b/fpdfsdk/formfiller/cffl_textobject.h
index fcb3c1b..ffadc73 100644
--- a/fpdfsdk/formfiller/cffl_textobject.h
+++ b/fpdfsdk/formfiller/cffl_textobject.h
@@ -16,7 +16,7 @@
class CFFL_TextObject : public CFFL_FormFiller {
public:
// CFFL_FormFiller:
- CPWL_Wnd* ResetPDFWindow(CPDFSDK_PageView* pPageView,
+ CPWL_Wnd* ResetPWLWindow(CPDFSDK_PageView* pPageView,
bool bRestoreValue) override;
protected:
diff --git a/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp b/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
index 855f894..7d3dd4d 100644
--- a/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
+++ b/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
@@ -65,7 +65,7 @@
ASSERT_TRUE(m_pFormFiller);
CPWL_Wnd* pWindow =
- m_pFormFiller->GetPDFWindow(m_pFormFillEnv->GetPageView(0), false);
+ m_pFormFiller->GetPWLWindow(m_pFormFillEnv->GetPageView(0), false);
ASSERT_TRUE(pWindow);
m_pComboBox = static_cast<CPWL_ComboBox*>(pWindow);
}
diff --git a/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp b/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
index ea8092a..4e9327c 100644
--- a/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
@@ -65,7 +65,7 @@
ASSERT_TRUE(m_pFormFiller);
CPWL_Wnd* pWindow =
- m_pFormFiller->GetPDFWindow(m_pFormFillEnv->GetPageView(0), false);
+ m_pFormFiller->GetPWLWindow(m_pFormFillEnv->GetPageView(0), false);
ASSERT_TRUE(pWindow);
m_pEdit = static_cast<CPWL_Edit*>(pWindow);
}
