18 files changed, 139 insertions, 126 deletions
diff --git a/xfa/fwl/basewidget/ifwl_spinbutton.h b/xfa/fwl/basewidget/ifwl_spinbutton.h
index 0b433d407a..2e81aeb9f2 100644
--- a/xfa/fwl/basewidget/ifwl_spinbutton.h
+++ b/xfa/fwl/basewidget/ifwl_spinbutton.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FWL_BASEWIDGET_IFWL_SPINBUTTON_H_
 #define XFA_FWL_BASEWIDGET_IFWL_SPINBUTTON_H_
 
-#include "xfa/fwl/core/fwl_widgetimp.h"
+#include "xfa/fxfa/include/cxfa_eventparam.h"
 
 #define FWL_CLASS_SpinButton L"FWL_SPINBUTTON"
 #define FWL_STYLEEXE_SPB_Vert (1L << 0)
diff --git a/xfa/fxbarcode/BC_DecoderResult.h b/xfa/fxbarcode/BC_DecoderResult.h
deleted file mode 100644
index e4170c8955..0000000000
--- a/xfa/fxbarcode/BC_DecoderResult.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXBARCODE_BC_DECODERRESULT_H_
-#define XFA_FXBARCODE_BC_DECODERRESULT_H_
-
-#include "core/fxcrt/include/fx_basic.h"
-
-class CBC_DecoderResult {
- public:
-  CBC_DecoderResult(CFX_ByteArray* rawBytes,
-                    CFX_ByteString text,
-                    CFX_ByteString ecLevel);
-  virtual ~CBC_DecoderResult();
-
-  CFX_ByteArray* getRawBytes();
-  CFX_ByteString getText();
-  CFX_ByteString getECLevel();
-  int32_t getErrorsCorrected();
-  void setErrorsCorrected(int32_t errorsCorrected);
-  int32_t getErasures();
-  void setErasures(int32_t erasures);
-  void* getOther();
-  void setOther(void* other);
-
- private:
-  CFX_ByteArray* m_rawBytes;
-  CFX_ByteString m_text;
-  CFX_ByteString m_ecLevel;
-  int32_t m_errorsCorrected;
-  int32_t m_erasures;
-  void* m_other;
-};
-
-#endif  // XFA_FXBARCODE_BC_DECODERRESULT_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
index 64ebbe13af..30632a494a 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
+++ b/xfa/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 
 #include "third_party/bigint/BigIntegerLibrary.hh"
-#include "xfa/fxbarcode/BC_DecoderResult.h"
 #include "xfa/fxbarcode/common/BC_CommonDecoderResult.h"
 #include "xfa/fxbarcode/pdf417/BC_PDF417ResultMetadata.h"
 #include "xfa/fxbarcode/utils.h"
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Reader.cpp b/xfa/fxbarcode/pdf417/BC_PDF417Reader.cpp
index 894b5d3fad..7d1779657c 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417Reader.cpp
+++ b/xfa/fxbarcode/pdf417/BC_PDF417Reader.cpp
@@ -26,7 +26,6 @@
 
 #include "xfa/fxbarcode/BC_BinaryBitmap.h"
 #include "xfa/fxbarcode/BC_BinaryBitmap.h"
-#include "xfa/fxbarcode/BC_DecoderResult.h"
 #include "xfa/fxbarcode/BC_Reader.h"
 #include "xfa/fxbarcode/BC_ResultPoint.h"
 #include "xfa/fxbarcode/common/BC_CommonBitArray.h"
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp b/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
index 479b65970e..fb33fe0d3f 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
+++ b/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
@@ -22,7 +22,6 @@
 
 #include <memory>
 
-#include "xfa/fxbarcode/BC_DecoderResult.h"
 #include "xfa/fxbarcode/BC_ResultPoint.h"
 #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
diff --git a/xfa/fxfa/app/cxfa_eventparam.cpp b/xfa/fxfa/app/cxfa_eventparam.cpp
new file mode 100644
index 0000000000..5f9d752969
--- /dev/null
+++ b/xfa/fxfa/app/cxfa_eventparam.cpp
@@ -0,0 +1,48 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#include "xfa/fxfa/include/cxfa_eventparam.h"
+
+#include "xfa/fxfa/include/fxfa.h"
+
+CXFA_EventParam::CXFA_EventParam()
+    : m_pTarget(nullptr),
+      m_eType(XFA_EVENT_Unknown),
+      m_bCancelAction(FALSE),
+      m_iCommitKey(0),
+      m_bKeyDown(FALSE),
+      m_bModifier(FALSE),
+      m_bReenter(FALSE),
+      m_iSelEnd(0),
+      m_iSelStart(0),
+      m_bShift(FALSE),
+      m_bIsFormReady(FALSE),
+      m_iValidateActivities(XFA_VALIDATE_preSubmit) {}
+
+CXFA_EventParam::~CXFA_EventParam() {}
+
+CXFA_EventParam::CXFA_EventParam(const CXFA_EventParam& other) = default;
+
+void CXFA_EventParam::Reset() {
+  m_wsChange.clear();
+  m_bCancelAction = FALSE;
+  m_iCommitKey = 0;
+  m_wsFullText.clear();
+  m_bKeyDown = FALSE;
+  m_bModifier = FALSE;
+  m_wsNewContentType.clear();
+  m_wsNewText.clear();
+  m_wsPrevContentType.clear();
+  m_wsPrevText.clear();
+  m_bReenter = FALSE;
+  m_iSelEnd = 0;
+  m_iSelStart = 0;
+  m_bShift = FALSE;
+  m_wsSoapFaultCode.clear();
+  m_wsSoapFaultString.clear();
+  m_bIsFormReady = FALSE;
+  m_iValidateActivities = XFA_VALIDATE_preSubmit;
+}
diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp
index 4258eef29b..4987b5ba23 100644
--- a/xfa/fxfa/app/xfa_ffchoicelist.cpp
+++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp
@@ -13,6 +13,7 @@
 #include "xfa/fwl/lightwidget/cfwl_listbox.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
+#include "xfa/fxfa/include/cxfa_eventparam.h"
 #include "xfa/fxfa/include/xfa_ffdoc.h"
 #include "xfa/fxfa/include/xfa_ffdocview.h"
 #include "xfa/fxfa/include/xfa_ffpageview.h"
diff --git a/xfa/fxfa/app/xfa_ffnotify.h b/xfa/fxfa/app/xfa_ffnotify.h
index 6dd400859b..e9e8721df3 100644
--- a/xfa/fxfa/app/xfa_ffnotify.h
+++ b/xfa/fxfa/app/xfa_ffnotify.h
@@ -7,6 +7,7 @@
 #ifndef XFA_FXFA_APP_XFA_FFNOTIFY_H_
 #define XFA_FXFA_APP_XFA_FFNOTIFY_H_
 
+#include "xfa/fxfa/include/cxfa_eventparam.h"
 #include "xfa/fxfa/parser/xfa_document.h"
 
 class CXFA_FFWidgetHandler;
diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp
index 35ed84810f..171fe8dd36 100644
--- a/xfa/fxfa/app/xfa_fftextedit.cpp
+++ b/xfa/fxfa/app/xfa_fftextedit.cpp
@@ -17,6 +17,7 @@
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
 #include "xfa/fxfa/app/xfa_textlayout.h"
+#include "xfa/fxfa/include/cxfa_eventparam.h"
 #include "xfa/fxfa/include/xfa_ffapp.h"
 #include "xfa/fxfa/include/xfa_ffdoc.h"
 #include "xfa/fxfa/include/xfa_ffdocview.h"
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp
index fb9ab5f580..fb4dc8ea6b 100644
--- a/xfa/fxfa/app/xfa_ffwidget.cpp
+++ b/xfa/fxfa/app/xfa_ffwidget.cpp
@@ -13,6 +13,8 @@
 #include "core/fxcodec/codec/include/ccodec_progressivedecoder.h"
 #include "core/fxcodec/include/fx_codec.h"
 #include "xfa/fxfa/app/xfa_textlayout.h"
+#include "xfa/fxfa/include/fxfa_widget.h"
+#include "xfa/fxfa/include/cxfa_eventparam.h"
 #include "xfa/fxfa/include/xfa_ffapp.h"
 #include "xfa/fxfa/include/xfa_ffdoc.h"
 #include "xfa/fxfa/include/xfa_ffdocview.h"
diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
index 6a4a1f4f6f..9eeccdbb44 100644
--- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp
+++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
@@ -17,6 +17,7 @@
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
 #include "xfa/fxfa/app/xfa_textlayout.h"
+#include "xfa/fxfa/include/cxfa_eventparam.h"
 #include "xfa/fxfa/include/xfa_ffapp.h"
 #include "xfa/fxfa/include/xfa_ffdoc.h"
 #include "xfa/fxfa/include/xfa_ffdocview.h"
diff --git a/xfa/fxfa/include/cxfa_eventparam.h b/xfa/fxfa/include/cxfa_eventparam.h
new file mode 100644
index 0000000000..9bc46fdc66
--- /dev/null
+++ b/xfa/fxfa/include/cxfa_eventparam.h
@@ -0,0 +1,79 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef XFA_FXFA_INCLUDE_CXFA_EVENTPARAM_H_
+#define XFA_FXFA_INCLUDE_CXFA_EVENTPARAM_H_
+
+#include "xfa/fxfa/include/fxfa_basic.h"
+
+class CXFA_WidgetAcc;
+
+enum XFA_EVENTTYPE {
+  XFA_EVENT_Click,
+  XFA_EVENT_Change,
+  XFA_EVENT_DocClose,
+  XFA_EVENT_DocReady,
+  XFA_EVENT_Enter,
+  XFA_EVENT_Exit,
+  XFA_EVENT_Full,
+  XFA_EVENT_IndexChange,
+  XFA_EVENT_Initialize,
+  XFA_EVENT_MouseDown,
+  XFA_EVENT_MouseEnter,
+  XFA_EVENT_MouseExit,
+  XFA_EVENT_MouseUp,
+  XFA_EVENT_PostExecute,
+  XFA_EVENT_PostOpen,
+  XFA_EVENT_PostPrint,
+  XFA_EVENT_PostSave,
+  XFA_EVENT_PostSign,
+  XFA_EVENT_PostSubmit,
+  XFA_EVENT_PreExecute,
+  XFA_EVENT_PreOpen,
+  XFA_EVENT_PrePrint,
+  XFA_EVENT_PreSave,
+  XFA_EVENT_PreSign,
+  XFA_EVENT_PreSubmit,
+  XFA_EVENT_Ready,
+  XFA_EVENT_InitCalculate,
+  XFA_EVENT_InitVariables,
+  XFA_EVENT_Calculate,
+  XFA_EVENT_Validate,
+  XFA_EVENT_Unknown,
+};
+
+class CXFA_EventParam {
+ public:
+  CXFA_EventParam();
+  ~CXFA_EventParam();
+  CXFA_EventParam(const CXFA_EventParam& other);
+
+  void Reset();
+
+  CXFA_WidgetAcc* m_pTarget;
+  XFA_EVENTTYPE m_eType;
+  CFX_WideString m_wsResult;
+  FX_BOOL m_bCancelAction;
+  int32_t m_iCommitKey;
+  FX_BOOL m_bKeyDown;
+  FX_BOOL m_bModifier;
+  FX_BOOL m_bReenter;
+  int32_t m_iSelEnd;
+  int32_t m_iSelStart;
+  FX_BOOL m_bShift;
+  CFX_WideString m_wsChange;
+  CFX_WideString m_wsFullText;
+  CFX_WideString m_wsNewContentType;
+  CFX_WideString m_wsNewText;
+  CFX_WideString m_wsPrevContentType;
+  CFX_WideString m_wsPrevText;
+  CFX_WideString m_wsSoapFaultCode;
+  CFX_WideString m_wsSoapFaultString;
+  FX_BOOL m_bIsFormReady;
+  int32_t m_iValidateActivities;
+};
+
+#endif  // XFA_FXFA_INCLUDE_CXFA_EVENTPARAM_H_
diff --git a/xfa/fxfa/include/fxfa.h b/xfa/fxfa/include/fxfa.h
index 981fcabffc..c62e916a97 100644
--- a/xfa/fxfa/include/fxfa.h
+++ b/xfa/fxfa/include/fxfa.h
@@ -143,40 +143,6 @@ enum XFA_WidgetStatus {
   XFA_WidgetStatus_Visible = 1 << 9
 };
 
-enum XFA_EVENTTYPE {
-  XFA_EVENT_Click,
-  XFA_EVENT_Change,
-  XFA_EVENT_DocClose,
-  XFA_EVENT_DocReady,
-  XFA_EVENT_Enter,
-  XFA_EVENT_Exit,
-  XFA_EVENT_Full,
-  XFA_EVENT_IndexChange,
-  XFA_EVENT_Initialize,
-  XFA_EVENT_MouseDown,
-  XFA_EVENT_MouseEnter,
-  XFA_EVENT_MouseExit,
-  XFA_EVENT_MouseUp,
-  XFA_EVENT_PostExecute,
-  XFA_EVENT_PostOpen,
-  XFA_EVENT_PostPrint,
-  XFA_EVENT_PostSave,
-  XFA_EVENT_PostSign,
-  XFA_EVENT_PostSubmit,
-  XFA_EVENT_PreExecute,
-  XFA_EVENT_PreOpen,
-  XFA_EVENT_PrePrint,
-  XFA_EVENT_PreSave,
-  XFA_EVENT_PreSign,
-  XFA_EVENT_PreSubmit,
-  XFA_EVENT_Ready,
-  XFA_EVENT_InitCalculate,
-  XFA_EVENT_InitVariables,
-  XFA_EVENT_Calculate,
-  XFA_EVENT_Validate,
-  XFA_EVENT_Unknown,
-};
-
 enum XFA_WIDGETORDER {
   XFA_WIDGETORDER_PreOrder,
 };
@@ -434,56 +400,6 @@ class IXFA_DocProvider {
                                        const CFX_WideString& wsLink) = 0;
 };
 
-class CXFA_EventParam {
- public:
-  CXFA_EventParam() {
-    m_pTarget = NULL;
-    m_eType = XFA_EVENT_Unknown;
-    m_wsResult.clear();
-    Reset();
-  }
-  void Reset() {
-    m_wsChange.clear();
-    m_iCommitKey = 0;
-    m_wsFullText.clear();
-    m_bKeyDown = FALSE;
-    m_bModifier = FALSE;
-    m_wsNewContentType.clear();
-    m_wsNewText.clear();
-    m_wsPrevContentType.clear();
-    m_wsPrevText.clear();
-    m_bReenter = FALSE;
-    m_iSelEnd = 0;
-    m_iSelStart = 0;
-    m_bShift = FALSE;
-    m_wsSoapFaultCode.clear();
-    m_wsSoapFaultString.clear();
-    m_bIsFormReady = FALSE;
-    m_iValidateActivities = XFA_VALIDATE_preSubmit;
-  }
-  CXFA_WidgetAcc* m_pTarget;
-  XFA_EVENTTYPE m_eType;
-  CFX_WideString m_wsResult;
-  FX_BOOL m_bCancelAction;
-  int32_t m_iCommitKey;
-  FX_BOOL m_bKeyDown;
-  FX_BOOL m_bModifier;
-  FX_BOOL m_bReenter;
-  int32_t m_iSelEnd;
-  int32_t m_iSelStart;
-  FX_BOOL m_bShift;
-  CFX_WideString m_wsChange;
-  CFX_WideString m_wsFullText;
-  CFX_WideString m_wsNewContentType;
-  CFX_WideString m_wsNewText;
-  CFX_WideString m_wsPrevContentType;
-  CFX_WideString m_wsPrevText;
-  CFX_WideString m_wsSoapFaultCode;
-  CFX_WideString m_wsSoapFaultString;
-  FX_BOOL m_bIsFormReady;
-  int32_t m_iValidateActivities;
-};
-
 class CXFA_RenderOptions {
  public:
   CXFA_RenderOptions() : m_bPrint(FALSE), m_bHighlight(TRUE) {}
diff --git a/xfa/fxfa/include/xfa_ffdocview.h b/xfa/fxfa/include/xfa_ffdocview.h
index b8ff562940..bc2373d155 100644
--- a/xfa/fxfa/include/xfa_ffdocview.h
+++ b/xfa/fxfa/include/xfa_ffdocview.h
@@ -10,6 +10,7 @@
 #include <map>
 #include <memory>
 
+#include "xfa/fxfa/include/cxfa_eventparam.h"
 #include "xfa/fxfa/include/xfa_ffdoc.h"
 
 class CXFA_FFWidgetHandler;
diff --git a/xfa/fxfa/include/xfa_ffwidgethandler.h b/xfa/fxfa/include/xfa_ffwidgethandler.h
index 8159d87cf0..4a6687e8c7 100644
--- a/xfa/fxfa/include/xfa_ffwidgethandler.h
+++ b/xfa/fxfa/include/xfa_ffwidgethandler.h
@@ -9,6 +9,7 @@
 
 #include <vector>
 
+#include "xfa/fxfa/include/cxfa_eventparam.h"
 #include "xfa/fxfa/include/fxfa.h"
 #include "xfa/fxfa/parser/xfa_document.h"
 
diff --git a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp
index d4ef935ada..e1bfd6b326 100644
--- a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp
+++ b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp
@@ -8,6 +8,7 @@
 
 #include "fxjse/include/cfxjse_arguments.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
+#include "xfa/fxfa/include/cxfa_eventparam.h"
 #include "xfa/fxfa/include/xfa_ffwidgethandler.h"
 #include "xfa/fxfa/parser/xfa_doclayout.h"
 #include "xfa/fxfa/parser/xfa_document.h"
diff --git a/xfa/fxfa/parser/xfa_script_imp.cpp b/xfa/fxfa/parser/xfa_script_imp.cpp
index 723a9aec7a..7a97899c96 100644
--- a/xfa/fxfa/parser/xfa_script_imp.cpp
+++ b/xfa/fxfa/parser/xfa_script_imp.cpp
@@ -11,6 +11,7 @@
 #include "fxjse/include/cfxjse_class.h"
 #include "fxjse/include/cfxjse_value.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
+#include "xfa/fxfa/include/cxfa_eventparam.h"
 #include "xfa/fxfa/parser/xfa_doclayout.h"
 #include "xfa/fxfa/parser/xfa_document.h"
 #include "xfa/fxfa/parser/xfa_localemgr.h"
diff --git a/xfa/fxfa/parser/xfa_script_imp.h b/xfa/fxfa/parser/xfa_script_imp.h
index d36e468b50..08be85f7c9 100644
--- a/xfa/fxfa/parser/xfa_script_imp.h
+++ b/xfa/fxfa/parser/xfa_script_imp.h
@@ -13,6 +13,7 @@
 
 #include "fxjse/include/cfxjse_arguments.h"
 #include "xfa/fxfa/fm2js/xfa_fm2jscontext.h"
+#include "xfa/fxfa/include/cxfa_eventparam.h"
 #include "xfa/fxfa/parser/xfa_document.h"
 #include "xfa/fxfa/parser/xfa_script.h"