commit 02d7107d0e2537d6adbe321984b6a3c24eed7dac
author Tom Sepez <tsepez@chromium.org> Tue Sep 21 22:43:01 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 21 22:43:01 2021 +0000
tree 63962bf23000c31f8be2871d273ee78af0d1dd8a
parent 03a5b08c99be8959ccea903bffe0cbe2738ce359

Remove argument from Annot_OnChangeFocus().

Follow-on from https://pdfium-review.googlesource.com/c/pdfium/+/85352

In turn, remove call with null argument, since we know it will be
a no-op.

Change-Id: I5211b3052d5cf89e499aa675c586bb7d82532ca5
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/85353
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

fpdfsdk/cpdfsdk_annothandlermgr.cpp

diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
index 447d59d..cc2841b 100644
--- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp
+++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
@@ -243,8 +243,7 @@
 
 #ifdef PDF_ENABLE_XFA
 bool CPDFSDK_AnnotHandlerMgr::Annot_OnChangeFocus(
-    ObservedPtr<CPDFSDK_Annot>* pSetAnnot,
-    ObservedPtr<CPDFSDK_Annot>* pKillAnnot) {
+    ObservedPtr<CPDFSDK_Annot>* pSetAnnot) {
   CPDFXFA_Widget* pSetXFAWidget = ToXFAWidget(pSetAnnot->Get());
   const bool bXFA = pSetXFAWidget && pSetXFAWidget->GetXFAFFWidget();
   return !bXFA || m_pXFAWidgetHandler->OnXFAChangedFocus(pSetAnnot);

fpdfsdk/cpdfsdk_annothandlermgr.h

diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.h b/fpdfsdk/cpdfsdk_annothandlermgr.h
index 630e4f8..54a790e 100644
--- a/fpdfsdk/cpdfsdk_annothandlermgr.h
+++ b/fpdfsdk/cpdfsdk_annothandlermgr.h
@@ -103,8 +103,7 @@
   bool Annot_IsIndexSelected(ObservedPtr<CPDFSDK_Annot>* pAnnot, int index);
 
 #ifdef PDF_ENABLE_XFA
-  bool Annot_OnChangeFocus(ObservedPtr<CPDFSDK_Annot>* pSetAnnot,
-                           ObservedPtr<CPDFSDK_Annot>* pKillAnnot);
+  bool Annot_OnChangeFocus(ObservedPtr<CPDFSDK_Annot>* pSetAnnot);
 #endif  // PDF_ENABLE_XFA
 
   CFX_FloatRect Annot_OnGetViewBBox(CPDFSDK_Annot* pAnnot);

fpdfsdk/cpdfsdk_formfillenvironment.cpp

diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index 1326804..1822101 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -762,14 +762,14 @@
     return false;
 
 #ifdef PDF_ENABLE_XFA
-  ObservedPtr<CPDFSDK_Annot> pLastFocusAnnot(m_pFocusAnnot.Get());
-  if (!pAnnotHandler->Annot_OnChangeFocus(pAnnot, &pLastFocusAnnot))
+  if (!pAnnotHandler->Annot_OnChangeFocus(pAnnot))
     return false;
 
   // |pAnnot| may be destroyed in |Annot_OnChangeFocus|.
   if (!pAnnot->HasObservable())
     return false;
 #endif  // PDF_ENABLE_XFA
+
   if (!pAnnotHandler->Annot_OnSetFocus(pAnnot, {}))
     return false;
   if (m_pFocusAnnot)
@@ -791,12 +791,6 @@
   ObservedPtr<CPDFSDK_Annot> pFocusAnnot(m_pFocusAnnot.Get());
   m_pFocusAnnot.Reset();
 
-#ifdef PDF_ENABLE_XFA
-  ObservedPtr<CPDFSDK_Annot> pNull;
-  if (!pAnnotHandler->Annot_OnChangeFocus(&pNull, &pFocusAnnot))
-    return false;
-#endif  // PDF_ENABLE_XFA
-
   if (!pAnnotHandler->Annot_OnKillFocus(&pFocusAnnot, nFlag)) {
     m_pFocusAnnot.Reset(pFocusAnnot.Get());
     return false;