Remove 'old' annot arg from OnXFAChangedFocus()
It is only used in one place to get a handler, which we can get from
the 'new' arg when present. When 'new' was absent, we short-circuited
execution anyways even if 'old' was present.
Change-Id: I6b1cdab05a63f0ae70d7326ebaf1375586c965fb
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/85352
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
index 49c2d0c..447d59d 100644
--- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp
+++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
@@ -246,11 +246,8 @@
ObservedPtr<CPDFSDK_Annot>* pSetAnnot,
ObservedPtr<CPDFSDK_Annot>* pKillAnnot) {
CPDFXFA_Widget* pSetXFAWidget = ToXFAWidget(pSetAnnot->Get());
- CPDFXFA_Widget* pKillXFAWidget = ToXFAWidget(pKillAnnot->Get());
- bool bXFA = (pSetXFAWidget && pSetXFAWidget->GetXFAFFWidget()) ||
- (pKillXFAWidget && pKillXFAWidget->GetXFAFFWidget());
-
- return !bXFA || m_pXFAWidgetHandler->OnXFAChangedFocus(pKillAnnot, pSetAnnot);
+ const bool bXFA = pSetXFAWidget && pSetXFAWidget->GetXFAFFWidget();
+ return !bXFA || m_pXFAWidgetHandler->OnXFAChangedFocus(pSetAnnot);
}
#endif // PDF_ENABLE_XFA
diff --git a/fpdfsdk/cpdfsdk_baannothandler.cpp b/fpdfsdk/cpdfsdk_baannothandler.cpp
index b1fd7a6..1e9b654 100644
--- a/fpdfsdk/cpdfsdk_baannothandler.cpp
+++ b/fpdfsdk/cpdfsdk_baannothandler.cpp
@@ -293,7 +293,6 @@
}
bool CPDFSDK_BAAnnotHandler::OnXFAChangedFocus(
- ObservedPtr<CPDFSDK_Annot>* pOldAnnot,
ObservedPtr<CPDFSDK_Annot>* pNewAnnot) {
NOTREACHED();
return false;
diff --git a/fpdfsdk/cpdfsdk_baannothandler.h b/fpdfsdk/cpdfsdk_baannothandler.h
index 02980d3..c055541 100644
--- a/fpdfsdk/cpdfsdk_baannothandler.h
+++ b/fpdfsdk/cpdfsdk_baannothandler.h
@@ -96,9 +96,7 @@
std::unique_ptr<CPDFSDK_Annot> NewAnnotForXFA(
CXFA_FFWidget* pAnnot,
CPDFSDK_PageView* pPageView) override;
-
- bool OnXFAChangedFocus(ObservedPtr<CPDFSDK_Annot>* pOldAnnot,
- ObservedPtr<CPDFSDK_Annot>* pNewAnnot) override;
+ bool OnXFAChangedFocus(ObservedPtr<CPDFSDK_Annot>* pNewAnnot) override;
#endif // PDF_ENABLE_XFA
private:
diff --git a/fpdfsdk/cpdfsdk_widgethandler.cpp b/fpdfsdk/cpdfsdk_widgethandler.cpp
index 8905e67..6b5c6cf 100644
--- a/fpdfsdk/cpdfsdk_widgethandler.cpp
+++ b/fpdfsdk/cpdfsdk_widgethandler.cpp
@@ -339,7 +339,6 @@
}
bool CPDFSDK_WidgetHandler::OnXFAChangedFocus(
- ObservedPtr<CPDFSDK_Annot>* pOldAnnot,
ObservedPtr<CPDFSDK_Annot>* pNewAnnot) {
NOTREACHED();
return false;
diff --git a/fpdfsdk/cpdfsdk_widgethandler.h b/fpdfsdk/cpdfsdk_widgethandler.h
index e1953501..c638f9c 100644
--- a/fpdfsdk/cpdfsdk_widgethandler.h
+++ b/fpdfsdk/cpdfsdk_widgethandler.h
@@ -95,9 +95,7 @@
std::unique_ptr<CPDFSDK_Annot> NewAnnotForXFA(
CXFA_FFWidget* pWiget,
CPDFSDK_PageView* pPageView) override;
-
- bool OnXFAChangedFocus(ObservedPtr<CPDFSDK_Annot>* pOldAnnot,
- ObservedPtr<CPDFSDK_Annot>* pNewAnnot) override;
+ bool OnXFAChangedFocus(ObservedPtr<CPDFSDK_Annot>* pNewAnnot) override;
#endif
private:
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.cpp
index 61c66ff..54633c8 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.cpp
@@ -534,15 +534,8 @@
}
bool CPDFXFA_WidgetHandler::OnXFAChangedFocus(
- ObservedPtr<CPDFSDK_Annot>* pOldAnnot,
ObservedPtr<CPDFSDK_Annot>* pNewAnnot) {
- CXFA_FFWidgetHandler* pWidgetHandler = nullptr;
- if (pOldAnnot->HasObservable())
- pWidgetHandler = GetXFAFFWidgetHandler(pOldAnnot->Get());
- else if (pNewAnnot->HasObservable())
- pWidgetHandler = GetXFAFFWidgetHandler(pNewAnnot->Get());
-
- if (!pWidgetHandler)
+ if (!pNewAnnot->HasObservable() || !GetXFAFFWidgetHandler(pNewAnnot->Get()))
return true;
CPDFXFA_Widget* pNewXFAWidget = ToXFAWidget(pNewAnnot->Get());
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.h b/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.h
index 1267ec8..1ec32bf 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.h
@@ -97,8 +97,7 @@
std::unique_ptr<CPDFSDK_Annot> NewAnnotForXFA(
CXFA_FFWidget* pFFWidget,
CPDFSDK_PageView* pPageView) override;
- bool OnXFAChangedFocus(ObservedPtr<CPDFSDK_Annot>* pOldAnnot,
- ObservedPtr<CPDFSDK_Annot>* pNewAnnot) override;
+ bool OnXFAChangedFocus(ObservedPtr<CPDFSDK_Annot>* pNewAnnot) override;
private:
CXFA_FFWidgetHandler* GetXFAFFWidgetHandler(CPDFSDK_Annot* pAnnot);
diff --git a/fpdfsdk/ipdfsdk_annothandler.cpp b/fpdfsdk/ipdfsdk_annothandler.cpp
index 8b1270d..65aa389 100644
--- a/fpdfsdk/ipdfsdk_annothandler.cpp
+++ b/fpdfsdk/ipdfsdk_annothandler.cpp
@@ -21,7 +21,6 @@
}
bool IPDFSDK_AnnotHandler::OnXFAChangedFocus(
- ObservedPtr<CPDFSDK_Annot>* pOldAnnot,
ObservedPtr<CPDFSDK_Annot>* pNewAnnot) {
NOTREACHED();
return false;
diff --git a/fpdfsdk/ipdfsdk_annothandler.h b/fpdfsdk/ipdfsdk_annothandler.h
index b40973e..1c42dcf 100644
--- a/fpdfsdk/ipdfsdk_annothandler.h
+++ b/fpdfsdk/ipdfsdk_annothandler.h
@@ -113,8 +113,7 @@
virtual std::unique_ptr<CPDFSDK_Annot> NewAnnotForXFA(
CXFA_FFWidget* pFFWidget,
CPDFSDK_PageView* pPageView);
- virtual bool OnXFAChangedFocus(ObservedPtr<CPDFSDK_Annot>* pOldAnnot,
- ObservedPtr<CPDFSDK_Annot>* pNewAnnot);
+ virtual bool OnXFAChangedFocus(ObservedPtr<CPDFSDK_Annot>* pNewAnnot);
#endif // PDF_ENABLE_XFA
private:
