commit ea38bf58009683977d110907270a01a103f45837
author Tom Sepez <tsepez@chromium.org> Wed Jan 15 23:11:12 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Jan 15 23:11:12 2020 +0000
tree 804a098efd6f05ad46ddaa0f3d81cb176f525e30
parent 4802f42dc518617a83a7c147eaa4b13ef804ba33

Move PDFSDK_XFAAActionType from cpdfsdk_fieldaction.h to cpdfsdk_widget.h

It isn't referenced in the one header, but it is in the other.

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

fpdfsdk/cpdfsdk_fieldaction.h

diff --git a/fpdfsdk/cpdfsdk_fieldaction.h b/fpdfsdk/cpdfsdk_fieldaction.h
index 7c24121..e287911 100644
--- a/fpdfsdk/cpdfsdk_fieldaction.h
+++ b/fpdfsdk/cpdfsdk_fieldaction.h
@@ -9,15 +9,6 @@
 
 #include "core/fxcrt/fx_string.h"
 
-#ifdef PDF_ENABLE_XFA
-typedef enum {
-  PDFSDK_XFA_Click = 0,
-  PDFSDK_XFA_Full,
-  PDFSDK_XFA_PreOpen,
-  PDFSDK_XFA_PostOpen
-} PDFSDK_XFAAActionType;
-#endif  // PDF_ENABLE_XFA
-
 struct CPDFSDK_FieldAction {
   CPDFSDK_FieldAction();
   CPDFSDK_FieldAction(const CPDFSDK_FieldAction& other) = delete;

fpdfsdk/cpdfsdk_widget.cpp

diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index ece3741..102fdc1 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -27,6 +27,7 @@
 #include "core/fxge/cfx_renderdevice.h"
 #include "fpdfsdk/cpdfsdk_actionhandler.h"
 #include "fpdfsdk/cpdfsdk_appstream.h"
+#include "fpdfsdk/cpdfsdk_fieldaction.h"
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_interactiveform.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"

fpdfsdk/cpdfsdk_widget.h

diff --git a/fpdfsdk/cpdfsdk_widget.h b/fpdfsdk/cpdfsdk_widget.h
index b24ef37..3037a16 100644
--- a/fpdfsdk/cpdfsdk_widget.h
+++ b/fpdfsdk/cpdfsdk_widget.h
@@ -16,7 +16,6 @@
 #include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/cfx_color.h"
 #include "fpdfsdk/cpdfsdk_baannot.h"
-#include "fpdfsdk/cpdfsdk_fieldaction.h"
 #include "third_party/base/optional.h"
 
 class CFX_RenderDevice;
@@ -28,10 +27,18 @@
 class CPDF_Stream;
 class CPDFSDK_InteractiveForm;
 class CPDFSDK_PageView;
+struct CPDFSDK_FieldAction;
 
 #ifdef PDF_ENABLE_XFA
 class CXFA_FFWidget;
 class CXFA_FFWidgetHandler;
+
+enum PDFSDK_XFAAActionType {
+  PDFSDK_XFA_Click = 0,
+  PDFSDK_XFA_Full,
+  PDFSDK_XFA_PreOpen,
+  PDFSDK_XFA_PostOpen
+};
 #endif  // PDF_ENABLE_XFA
 
 class CPDFSDK_Widget final : public CPDFSDK_BAAnnot {