commit ee68cd18a22e120d5f341199be7e82bfda888da8
author Lei Zhang <thestig@chromium.org> Wed Aug 29 18:14:58 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Aug 29 18:14:58 2018 +0000
tree 23fdccdff03e1b705620775b96fcedb67a30e8a6
parent 5b346563297d1a2cb19a3a101a4b5d50c4aee23c

Move XFA_RESOLVENODE_TagName to xfa_resolvenode_rs.h.

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

fxjs/cfxjse_engine.h

diff --git a/fxjs/cfxjse_engine.h b/fxjs/cfxjse_engine.h
index 4d4daf8..bf561e7 100644
--- a/fxjs/cfxjse_engine.h
+++ b/fxjs/cfxjse_engine.h
@@ -20,8 +20,6 @@
 #include "xfa/fxfa/parser/cxfa_script.h"
 #include "xfa/fxfa/parser/xfa_resolvenode_rs.h"
 
-#define XFA_RESOLVENODE_TagName 0x0002
-
 class CFXJSE_ResolveProcessor;
 class CJS_Runtime;
 class CXFA_List;

fxjs/cfxjse_resolveprocessor.cpp

diff --git a/fxjs/cfxjse_resolveprocessor.cpp b/fxjs/cfxjse_resolveprocessor.cpp
index 917f78c..6dd4d0c 100644
--- a/fxjs/cfxjse_resolveprocessor.cpp
+++ b/fxjs/cfxjse_resolveprocessor.cpp
@@ -26,7 +26,7 @@
 #include "xfa/fxfa/parser/xfa_utils.h"
 
 CFXJSE_ResolveProcessor::CFXJSE_ResolveProcessor()
-    : m_iCurStart(0), m_pNodeHelper(pdfium::MakeUnique<CXFA_NodeHelper>()) {}
+    : m_pNodeHelper(pdfium::MakeUnique<CXFA_NodeHelper>()) {}
 
 CFXJSE_ResolveProcessor::~CFXJSE_ResolveProcessor() {}
 

fxjs/cfxjse_resolveprocessor.h

diff --git a/fxjs/cfxjse_resolveprocessor.h b/fxjs/cfxjse_resolveprocessor.h
index 71aba6e..521128b 100644
--- a/fxjs/cfxjse_resolveprocessor.h
+++ b/fxjs/cfxjse_resolveprocessor.h
@@ -70,8 +70,8 @@
                          CFXJSE_ResolveNodeData& rnd);
   void FilterCondition(CFXJSE_ResolveNodeData& rnd, WideString wsCondition);
 
-  int32_t m_iCurStart;
-  std::unique_ptr<CXFA_NodeHelper> m_pNodeHelper;
+  int32_t m_iCurStart = 0;
+  const std::unique_ptr<CXFA_NodeHelper> m_pNodeHelper;
 };
 
 #endif  // FXJS_CFXJSE_RESOLVEPROCESSOR_H_

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 7039c61..5991e0a 100644
--- a/xfa/fxfa/parser/xfa_resolvenode_rs.h
+++ b/xfa/fxfa/parser/xfa_resolvenode_rs.h
@@ -14,6 +14,7 @@
 #include "xfa/fxfa/parser/cxfa_object.h"
 
 #define XFA_RESOLVENODE_Children 0x0001
+#define XFA_RESOLVENODE_TagName 0x0002
 #define XFA_RESOLVENODE_Attributes 0x0004
 #define XFA_RESOLVENODE_Properties 0x0008
 #define XFA_RESOLVENODE_Siblings 0x0020