commit ca72689f80ec0a471057ed5e3c246163d2d951c5
author Tom Sepez <tsepez@chromium.org> Thu Dec 13 21:54:12 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Dec 13 21:54:12 2018 +0000
tree 11b71d660698e6a3845116cd31d336372f908145
parent 0826582e9ff7fdc8e2a6d625facaaf0c309cb21c

Move XFA_ATTRIBUTEINFO and SCRIPTATTRIBUTEINFO to xfa_basic_data.h.

Put their declarations near the functions that return them. Straight
move apart from shuffling some includes as required.

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

fxjs/xfa/cjx_object.h

diff --git a/fxjs/xfa/cjx_object.h b/fxjs/xfa/cjx_object.h
index 56c30ef..7c4a1ee 100644
--- a/fxjs/xfa/cjx_object.h
+++ b/fxjs/xfa/cjx_object.h
@@ -279,15 +279,4 @@
                                                    bool bSetting,
                                                    XFA_Attribute eAttribute);
 
-struct XFA_ATTRIBUTEINFO {
-  XFA_Attribute attribute;
-  XFA_ScriptType eValueType;
-};
-
-struct XFA_SCRIPTATTRIBUTEINFO {
-  XFA_Attribute attribute;
-  XFA_ScriptType eValueType;
-  XFA_ATTRIBUTE_CALLBACK callback = nullptr;
-};
-
 #endif  // FXJS_XFA_CJX_OBJECT_H_

xfa/fxfa/parser/xfa_basic_data.h

diff --git a/xfa/fxfa/parser/xfa_basic_data.h b/xfa/fxfa/parser/xfa_basic_data.h
index 609e8e0..d17e512 100644
--- a/xfa/fxfa/parser/xfa_basic_data.h
+++ b/xfa/fxfa/parser/xfa_basic_data.h
@@ -14,6 +14,17 @@
 #include "third_party/base/optional.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
+struct XFA_ATTRIBUTEINFO {
+  XFA_Attribute attribute;
+  XFA_ScriptType eValueType;
+};
+
+struct XFA_SCRIPTATTRIBUTEINFO {
+  XFA_Attribute attribute;
+  XFA_ScriptType eValueType;
+  XFA_ATTRIBUTE_CALLBACK callback = nullptr;
+};
+
 ByteStringView XFA_ElementToName(XFA_Element elem);
 XFA_Element XFA_GetElementByName(const WideString& name);
 

xfa/fxfa/parser/xfa_resolvenode_rs.h

diff --git a/xfa/fxfa/parser/xfa_resolvenode_rs.h b/xfa/fxfa/parser/xfa_resolvenode_rs.h
index ed2acd5..dd9b79a 100644
--- a/xfa/fxfa/parser/xfa_resolvenode_rs.h
+++ b/xfa/fxfa/parser/xfa_resolvenode_rs.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "core/fxcrt/unowned_ptr.h"
-#include "fxjs/xfa/cjx_object.h"
+#include "xfa/fxfa/parser/xfa_basic_data.h"
 
 class CXFA_Object;