4 files changed, 47 insertions, 1 deletions
diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h
index d26aa7b9c8..5c36779df7 100644
--- a/fpdfsdk/include/formfiller/FFL_ComboBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h
@@ -55,6 +55,11 @@ class CFFL_ComboBox : public CFFL_FormFiller,
   // IPWL_Edit_Notify:
   void OnAddUndo(CPWL_Edit* pEdit) override;
 
+#ifdef PDF_ENABLE_XFA
+  // CFFL_FormFiller:
+  FX_BOOL IsFieldFull(CPDFSDK_PageView* pPageView) override;
+#endif  // PDF_ENABLE_XFA
+
  private:
   CFX_WideString GetSelectExportText();
 
diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h
index ff7d0ab28c..cb14397be5 100644
--- a/fpdfsdk/include/formfiller/FFL_FormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h
@@ -121,6 +121,10 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler {
   virtual FX_BOOL IsDataChanged(CPDFSDK_PageView* pPageView);
   virtual void SaveData(CPDFSDK_PageView* pPageView);
 
+#ifdef PDF_ENABLE_XFA
+  virtual FX_BOOL IsFieldFull(CPDFSDK_PageView* pPageView);
+#endif  // PDF_ENABLE_XFA
+
   CPWL_Wnd* GetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bNew);
   void DestroyPDFWindow(CPDFSDK_PageView* pPageView);
   void EscapeFiller(CPDFSDK_PageView* pPageView, FX_BOOL bDestroyPDFWindow);
diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
index 95e2f8df83..93e7505f9c 100644
--- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
@@ -117,6 +117,28 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify {
                   FX_BOOL& bReset,
                   FX_BOOL& bExit,
                   FX_UINT nFlag);
+#ifdef PDF_ENABLE_XFA
+  void OnClick(CPDFSDK_Widget* pWidget,
+               CPDFSDK_PageView* pPageView,
+               FX_BOOL& bReset,
+               FX_BOOL& bExit,
+               FX_UINT nFlag);
+  void OnFull(CPDFSDK_Widget* pWidget,
+              CPDFSDK_PageView* pPageView,
+              FX_BOOL& bReset,
+              FX_BOOL& bExit,
+              FX_UINT nFlag);
+  void OnPreOpen(CPDFSDK_Widget* pWidget,
+                 CPDFSDK_PageView* pPageView,
+                 FX_BOOL& bReset,
+                 FX_BOOL& bExit,
+                 FX_UINT nFlag);
+  void OnPostOpen(CPDFSDK_Widget* pWidget,
+                  CPDFSDK_PageView* pPageView,
+                  FX_BOOL& bReset,
+                  FX_BOOL& bExit,
+                  FX_UINT nFlag);
+#endif  // PDF_ENABLE_XFA
 
  private:
   using CFFL_Widget2Filler = std::map<CPDFSDK_Annot*, CFFL_FormFiller*>;
@@ -136,7 +158,17 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify {
                          FX_BOOL& bRC,
                          FX_BOOL& bExit,
                          FX_DWORD nFlag) override;
-
+#ifdef PDF_ENABLE_XFA
+  void OnPopupPreOpen(void* pPrivateData,
+                      FX_BOOL& bExit,
+                      FX_DWORD nFlag) override;
+  void OnPopupPostOpen(void* pPrivateData,
+                       FX_BOOL& bExit,
+                       FX_DWORD nFlag) override;
+  void SetFocusAnnotTab(CPDFSDK_Annot* pWidget,
+                        FX_BOOL bSameField,
+                        FX_BOOL bNext);
+#endif  // PDF_ENABLE_XFA
   void UnRegisterFormFiller(CPDFSDK_Annot* pAnnot);
 
   CPDFDoc_Environment* m_pApp;
diff --git a/fpdfsdk/include/formfiller/FFL_TextField.h b/fpdfsdk/include/formfiller/FFL_TextField.h
index 057825a4e1..12ac15abb8 100644
--- a/fpdfsdk/include/formfiller/FFL_TextField.h
+++ b/fpdfsdk/include/formfiller/FFL_TextField.h
@@ -56,6 +56,11 @@ class CFFL_TextField : public CFFL_FormFiller,
   // IPWL_Edit_Notify:
   void OnAddUndo(CPWL_Edit* pEdit) override;
 
+#ifdef PDF_ENABLE_XFA
+  // CFFL_FormFiller:
+  FX_BOOL IsFieldFull(CPDFSDK_PageView* pPageView) override;
+#endif  // PDF_ENABLE_XFA
+
  private:
   CBA_FontMap* m_pFontMap;
   FFL_TextFieldState m_State;