summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fxjs/cfxjse_engine.cpp1
-rw-r--r--fxjs/cfxjse_resolveprocessor.h2
-rw-r--r--xfa/fgas/crt/cfgas_formatstring.cpp1
-rw-r--r--xfa/fgas/crt/cfgas_formatstring.h3
-rw-r--r--xfa/fgas/font/cfgas_fontmgr.h1
-rw-r--r--xfa/fgas/font/cfgas_pdffontmgr.h1
-rw-r--r--xfa/fxfa/cxfa_eventparam.h1
-rw-r--r--xfa/fxfa/fxfa.h1
-rw-r--r--xfa/fxfa/fxfa_basic.h2
-rw-r--r--xfa/fxfa/parser/cxfa_nodehelper.h3
-rw-r--r--xfa/fxfa/parser/cxfa_object.cpp1
-rw-r--r--xfa/fxfa/parser/cxfa_treelist.cpp6
-rw-r--r--xfa/fxfa/parser/cxfa_treelist.h3
-rw-r--r--xfa/fxfa/parser/xfa_basic_data.h2
-rw-r--r--xfa/fxfa/parser/xfa_basic_data_enum.cpp1
-rw-r--r--xfa/fxfa/parser/xfa_resolvenode_rs.h5
16 files changed, 22 insertions, 12 deletions
diff --git a/fxjs/cfxjse_engine.cpp b/fxjs/cfxjse_engine.cpp
index eb19573411..d5c43137db 100644
--- a/fxjs/cfxjse_engine.cpp
+++ b/fxjs/cfxjse_engine.cpp
@@ -15,6 +15,7 @@
#include "fxjs/cfxjse_resolveprocessor.h"
#include "fxjs/cfxjse_value.h"
#include "fxjs/cjs_runtime.h"
+#include "fxjs/xfa/cjx_object.h"
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
#include "xfa/fxfa/cxfa_eventparam.h"
diff --git a/fxjs/cfxjse_resolveprocessor.h b/fxjs/cfxjse_resolveprocessor.h
index 2a98bc9b2a..1d3869057a 100644
--- a/fxjs/cfxjse_resolveprocessor.h
+++ b/fxjs/cfxjse_resolveprocessor.h
@@ -10,6 +10,8 @@
#include <memory>
#include <vector>
+#include "core/fxcrt/fx_string.h"
+#include "xfa/fxfa/fxfa_basic.h"
#include "xfa/fxfa/parser/xfa_resolvenode_rs.h"
class CXFA_NodeHelper;
diff --git a/xfa/fgas/crt/cfgas_formatstring.cpp b/xfa/fgas/crt/cfgas_formatstring.cpp
index e5ac01416d..b31c33022e 100644
--- a/xfa/fgas/crt/cfgas_formatstring.cpp
+++ b/xfa/fgas/crt/cfgas_formatstring.cpp
@@ -12,6 +12,7 @@
#include "core/fxcrt/cfx_decimal.h"
#include "core/fxcrt/fx_extension.h"
+#include "xfa/fxfa/parser/cxfa_localemgr.h"
#define FX_LOCALECATEGORY_DateHash 0xbde9abde
#define FX_LOCALECATEGORY_TimeHash 0x2d71b00f
diff --git a/xfa/fgas/crt/cfgas_formatstring.h b/xfa/fgas/crt/cfgas_formatstring.h
index 4fdc39df0c..0c51ef33b6 100644
--- a/xfa/fgas/crt/cfgas_formatstring.h
+++ b/xfa/fgas/crt/cfgas_formatstring.h
@@ -11,7 +11,8 @@
#include "core/fxcrt/locale_iface.h"
#include "core/fxcrt/unowned_ptr.h"
-#include "xfa/fxfa/parser/cxfa_localemgr.h"
+
+class CXFA_LocaleMgr;
bool FX_DateFromCanonical(const WideString& wsDate, CFX_DateTime* datetime);
bool FX_TimeFromCanonical(const WideStringView& wsTime,
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h
index 0fd46c451e..2bda20ceb1 100644
--- a/xfa/fgas/font/cfgas_fontmgr.h
+++ b/xfa/fgas/font/cfgas_fontmgr.h
@@ -23,6 +23,7 @@
class CFGAS_GEFont;
class CFX_FontMapper;
class CFX_FontSourceEnum_File;
+class IFX_SeekableReadStream;
#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
struct FX_FONTMATCHPARAMS {
diff --git a/xfa/fgas/font/cfgas_pdffontmgr.h b/xfa/fgas/font/cfgas_pdffontmgr.h
index b6ce472fca..08d91c8ae1 100644
--- a/xfa/fgas/font/cfgas_pdffontmgr.h
+++ b/xfa/fgas/font/cfgas_pdffontmgr.h
@@ -9,7 +9,6 @@
#include <map>
-#include "core/fpdfapi/parser/cpdf_document.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/observable.h"
#include "core/fxcrt/retain_ptr.h"
diff --git a/xfa/fxfa/cxfa_eventparam.h b/xfa/fxfa/cxfa_eventparam.h
index b882d4fa75..cb90c6971f 100644
--- a/xfa/fxfa/cxfa_eventparam.h
+++ b/xfa/fxfa/cxfa_eventparam.h
@@ -7,6 +7,7 @@
#ifndef XFA_FXFA_CXFA_EVENTPARAM_H_
#define XFA_FXFA_CXFA_EVENTPARAM_H_
+#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/unowned_ptr.h"
#include "xfa/fxfa/fxfa_basic.h"
diff --git a/xfa/fxfa/fxfa.h b/xfa/fxfa/fxfa.h
index 0796347506..1e89c794c8 100644
--- a/xfa/fxfa/fxfa.h
+++ b/xfa/fxfa/fxfa.h
@@ -15,6 +15,7 @@
#include "core/fxge/fx_dib.h"
#include "xfa/fxfa/fxfa_basic.h"
+class CFXJSE_Value;
class CXFA_FFDoc;
class CXFA_FFPageView;
class CXFA_FFWidget;
diff --git a/xfa/fxfa/fxfa_basic.h b/xfa/fxfa/fxfa_basic.h
index 78392d52ce..916515fc4a 100644
--- a/xfa/fxfa/fxfa_basic.h
+++ b/xfa/fxfa/fxfa_basic.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXFA_FXFA_BASIC_H_
#define XFA_FXFA_FXFA_BASIC_H_
-#include "fxjs/fxjse.h"
+#include <stdint.h>
class CXFA_Measurement;
enum class XFA_ObjectType;
diff --git a/xfa/fxfa/parser/cxfa_nodehelper.h b/xfa/fxfa/parser/cxfa_nodehelper.h
index e2b367d0f3..3dcbe4cadc 100644
--- a/xfa/fxfa/parser/cxfa_nodehelper.h
+++ b/xfa/fxfa/parser/cxfa_nodehelper.h
@@ -9,9 +9,12 @@
#include <vector>
+#include "core/fxcrt/fx_string.h"
+#include "xfa/fxfa/fxfa_basic.h"
#include "xfa/fxfa/parser/xfa_resolvenode_rs.h"
class CFXJSE_Engine;
+class CXFA_Node;
enum XFA_LOGIC_TYPE {
XFA_LOGIC_NoTransparent,
diff --git a/xfa/fxfa/parser/cxfa_object.cpp b/xfa/fxfa/parser/cxfa_object.cpp
index 44b5729b8d..024dba2fd5 100644
--- a/xfa/fxfa/parser/cxfa_object.cpp
+++ b/xfa/fxfa/parser/cxfa_object.cpp
@@ -11,6 +11,7 @@
#include "core/fxcrt/fx_extension.h"
#include "fxjs/cfxjse_engine.h"
#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cjx_object.h"
#include "xfa/fxfa/cxfa_ffnotify.h"
#include "xfa/fxfa/parser/cxfa_document.h"
#include "xfa/fxfa/parser/cxfa_node.h"
diff --git a/xfa/fxfa/parser/cxfa_treelist.cpp b/xfa/fxfa/parser/cxfa_treelist.cpp
index 38181f25e5..1c1ab2df39 100644
--- a/xfa/fxfa/parser/cxfa_treelist.cpp
+++ b/xfa/fxfa/parser/cxfa_treelist.cpp
@@ -9,12 +9,8 @@
#include <memory>
#include "core/fxcrt/fx_extension.h"
-#include "fxjs/cfxjse_engine.h"
#include "fxjs/xfa/cjx_treelist.h"
-#include "third_party/base/numerics/safe_conversions.h"
#include "third_party/base/ptr_util.h"
-#include "xfa/fxfa/parser/cxfa_document.h"
-#include "xfa/fxfa/parser/cxfa_list.h"
#include "xfa/fxfa/parser/cxfa_node.h"
CXFA_TreeList::CXFA_TreeList(CXFA_Document* pDocument)
@@ -24,7 +20,7 @@ CXFA_TreeList::CXFA_TreeList(CXFA_Document* pDocument)
WideStringView(L"treeList"),
pdfium::MakeUnique<CJX_TreeList>(this)) {}
-CXFA_TreeList::~CXFA_TreeList() {}
+CXFA_TreeList::~CXFA_TreeList() = default;
CXFA_Node* CXFA_TreeList::NamedItem(const WideStringView& wsName) {
uint32_t dwHashCode = FX_HashCode_GetW(wsName, false);
diff --git a/xfa/fxfa/parser/cxfa_treelist.h b/xfa/fxfa/parser/cxfa_treelist.h
index 3c65ca5963..997c763792 100644
--- a/xfa/fxfa/parser/cxfa_treelist.h
+++ b/xfa/fxfa/parser/cxfa_treelist.h
@@ -7,8 +7,7 @@
#ifndef XFA_FXFA_PARSER_CXFA_TREELIST_H_
#define XFA_FXFA_PARSER_CXFA_TREELIST_H_
-#include "fxjs/xfa/cjx_treelist.h"
-#include "xfa/fxfa/fxfa_basic.h"
+#include "core/fxcrt/fx_string.h"
#include "xfa/fxfa/parser/cxfa_list.h"
class CXFA_Node;
diff --git a/xfa/fxfa/parser/xfa_basic_data.h b/xfa/fxfa/parser/xfa_basic_data.h
index 1e69c0af29..9adb4f815f 100644
--- a/xfa/fxfa/parser/xfa_basic_data.h
+++ b/xfa/fxfa/parser/xfa_basic_data.h
@@ -7,6 +7,8 @@
#ifndef XFA_FXFA_PARSER_XFA_BASIC_DATA_H_
#define XFA_FXFA_PARSER_XFA_BASIC_DATA_H_
+#include <stddef.h>
+
#include "xfa/fxfa/fxfa_basic.h"
extern const XFA_AttributeEnumInfo g_XFAEnumData[];
diff --git a/xfa/fxfa/parser/xfa_basic_data_enum.cpp b/xfa/fxfa/parser/xfa_basic_data_enum.cpp
index e2c589c31d..7c0a148369 100644
--- a/xfa/fxfa/parser/xfa_basic_data_enum.cpp
+++ b/xfa/fxfa/parser/xfa_basic_data_enum.cpp
@@ -6,6 +6,7 @@
#include "xfa/fxfa/parser/xfa_basic_data.h"
+#include "core/fxcrt/fx_memory.h"
#include "xfa/fxfa/fxfa_basic.h"
const XFA_AttributeEnumInfo g_XFAEnumData[] = {
diff --git a/xfa/fxfa/parser/xfa_resolvenode_rs.h b/xfa/fxfa/parser/xfa_resolvenode_rs.h
index 5991e0a9e1..5b24f82258 100644
--- a/xfa/fxfa/parser/xfa_resolvenode_rs.h
+++ b/xfa/fxfa/parser/xfa_resolvenode_rs.h
@@ -10,8 +10,9 @@
#include <vector>
#include "core/fxcrt/unowned_ptr.h"
-#include "fxjs/xfa/cjx_object.h"
-#include "xfa/fxfa/parser/cxfa_object.h"
+
+class CXFA_Object;
+struct XFA_SCRIPTATTRIBUTEINFO;
#define XFA_RESOLVENODE_Children 0x0001
#define XFA_RESOLVENODE_TagName 0x0002