3 files changed, 16 insertions, 16 deletions
diff --git a/fpdfsdk/include/cpdfsdk_annothandlermgr.h b/fpdfsdk/include/cpdfsdk_annothandlermgr.h
index 2ff35f83be..016135c0d0 100644
--- a/fpdfsdk/include/cpdfsdk_annothandlermgr.h
+++ b/fpdfsdk/include/cpdfsdk_annothandlermgr.h
@@ -19,12 +19,12 @@ class CPDF_Annot;
 class CPDFDoc_Environment;
 class CPDFSDK_Annot;
 class CPDFSDK_BAAnnotHandler;
-class CPDFSDK_BFAnnotHandler;
+class CPDFSDK_WidgetHandler;
 class CPDFSDK_PageView;
 class IPDFSDK_AnnotHandler;
 
 #ifdef PDF_ENABLE_XFA
-class CPDFSDK_XFAAnnotHandler;
+class CPDFSDK_XFAWidgetHandler;
 class CXFA_FFWidget;
 #endif  // PDF_ENABLE_XFA
 
@@ -113,9 +113,9 @@ class CPDFSDK_AnnotHandlerMgr {
   CPDFSDK_Annot* GetNextAnnot(CPDFSDK_Annot* pSDKAnnot, FX_BOOL bNext);
 
   std::unique_ptr<CPDFSDK_BAAnnotHandler> m_pBAAnnotHandler;
-  std::unique_ptr<CPDFSDK_BFAnnotHandler> m_pBFAnnotHandler;
+  std::unique_ptr<CPDFSDK_WidgetHandler> m_pWidgetHandler;
 #ifdef PDF_ENABLE_XFA
-  std::unique_ptr<CPDFSDK_XFAAnnotHandler> m_pXFAAnnotHandler;
+  std::unique_ptr<CPDFSDK_XFAWidgetHandler> m_pXFAWidgetHandler;
 #endif  // PDF_ENABLE_XFA
 
   CPDFDoc_Environment* m_pApp;
diff --git a/fpdfsdk/include/cpdfsdk_bfannothandler.h b/fpdfsdk/include/cpdfsdk_widgethandler.h
index be7e79279d..0155967f3a 100644
--- a/fpdfsdk/include/cpdfsdk_bfannothandler.h
+++ b/fpdfsdk/include/cpdfsdk_widgethandler.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_CPDFSDK_BFANNOTHANDLER_H_
-#define FPDFSDK_INCLUDE_CPDFSDK_BFANNOTHANDLER_H_
+#ifndef FPDFSDK_INCLUDE_CPDFSDK_WIDGETHANDLER_H_
+#define FPDFSDK_INCLUDE_CPDFSDK_WIDGETHANDLER_H_
 
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_coordinates.h"
@@ -23,10 +23,10 @@ class CPDFSDK_PageView;
 class CXFA_FFWidget;
 #endif  // PDF_ENABLE_XFA
 
-class CPDFSDK_BFAnnotHandler : public IPDFSDK_AnnotHandler {
+class CPDFSDK_WidgetHandler : public IPDFSDK_AnnotHandler {
  public:
-  explicit CPDFSDK_BFAnnotHandler(CPDFDoc_Environment* pApp);
-  ~CPDFSDK_BFAnnotHandler() override;
+  explicit CPDFSDK_WidgetHandler(CPDFDoc_Environment* pApp);
+  ~CPDFSDK_WidgetHandler() override;
 
   CFX_ByteString GetType() override;
   FX_BOOL CanAnswer(CPDFSDK_Annot* pAnnot) override;
@@ -118,4 +118,4 @@ class CPDFSDK_BFAnnotHandler : public IPDFSDK_AnnotHandler {
   CFFL_IFormFiller* m_pFormFiller;
 };
 
-#endif  // FPDFSDK_INCLUDE_CPDFSDK_BFANNOTHANDLER_H_
+#endif  // FPDFSDK_INCLUDE_CPDFSDK_WIDGETHANDLER_H_
diff --git a/fpdfsdk/include/cpdfsdk_xfaannothandler.h b/fpdfsdk/include/cpdfsdk_xfawidgethandler.h
index 2dd6f297a7..84e74b4a73 100644
--- a/fpdfsdk/include/cpdfsdk_xfaannothandler.h
+++ b/fpdfsdk/include/cpdfsdk_xfawidgethandler.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_CPDFSDK_XFAANNOTHANDLER_H_
-#define FPDFSDK_INCLUDE_CPDFSDK_XFAANNOTHANDLER_H_
+#ifndef FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGETHANDLER_H_
+#define FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGETHANDLER_H_
 
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_coordinates.h"
@@ -20,10 +20,10 @@ class CPDFSDK_PageView;
 class CXFA_FFWidget;
 class CXFA_FFWidgetHandler;
 
-class CPDFSDK_XFAAnnotHandler : public IPDFSDK_AnnotHandler {
+class CPDFSDK_XFAWidgetHandler : public IPDFSDK_AnnotHandler {
  public:
-  explicit CPDFSDK_XFAAnnotHandler(CPDFDoc_Environment* pApp);
-  ~CPDFSDK_XFAAnnotHandler() override;
+  explicit CPDFSDK_XFAWidgetHandler(CPDFDoc_Environment* pApp);
+  ~CPDFSDK_XFAWidgetHandler() override;
 
   CFX_ByteString GetType() override;
   FX_BOOL CanAnswer(CPDFSDK_Annot* pAnnot) override;
@@ -110,4 +110,4 @@ class CPDFSDK_XFAAnnotHandler : public IPDFSDK_AnnotHandler {
   CPDFDoc_Environment* m_pApp;
 };
 
-#endif  // FPDFSDK_INCLUDE_CPDFSDK_XFAANNOTHANDLER_H_
+#endif  // FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGETHANDLER_H_