From c002261326795102c4680c43ea447674dd4d6f3b Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 11 Dec 2017 22:31:58 +0000 Subject: [xfa] Move CJX code into fxjs/xfa This CL moves the remaining CJX clases into fxjs/xfa so they co-exist with the rest of the CJX classes. Change-Id: I2b1e5504ac23f73df177f309967a04ab27fb61d1 Reviewed-on: https://pdfium-review.googlesource.com/20550 Commit-Queue: dsinclair Reviewed-by: Lei Zhang --- xfa/fxfa/parser/cscript_datawindow.cpp | 2 +- xfa/fxfa/parser/cscript_datawindow.h | 2 +- xfa/fxfa/parser/cscript_eventpseudomodel.cpp | 2 +- xfa/fxfa/parser/cscript_eventpseudomodel.h | 2 +- xfa/fxfa/parser/cscript_hostpseudomodel.h | 2 +- xfa/fxfa/parser/cscript_layoutpseudomodel.h | 2 +- xfa/fxfa/parser/cscript_logpseudomodel.h | 2 +- xfa/fxfa/parser/cscript_signaturepseudomodel.h | 2 +- xfa/fxfa/parser/cxfa_node.h | 2 +- xfa/fxfa/parser/cxfa_thisproxy.cpp | 4 ++-- xfa/fxfa/parser/xfa_basic_data_element_script.cpp | 14 +++++++------- 11 files changed, 18 insertions(+), 18 deletions(-) (limited to 'xfa') diff --git a/xfa/fxfa/parser/cscript_datawindow.cpp b/xfa/fxfa/parser/cscript_datawindow.cpp index 25ad589fe5..0bf17e54c0 100644 --- a/xfa/fxfa/parser/cscript_datawindow.cpp +++ b/xfa/fxfa/parser/cscript_datawindow.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cscript_datawindow.h" -#include "fxjs/cjx_datawindow.h" +#include "fxjs/xfa/cjx_datawindow.h" #include "third_party/base/ptr_util.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_localemgr.h" diff --git a/xfa/fxfa/parser/cscript_datawindow.h b/xfa/fxfa/parser/cscript_datawindow.h index fa29926845..819e8fe601 100644 --- a/xfa/fxfa/parser/cscript_datawindow.h +++ b/xfa/fxfa/parser/cscript_datawindow.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CSCRIPT_DATAWINDOW_H_ #define XFA_FXFA_PARSER_CSCRIPT_DATAWINDOW_H_ -#include "fxjs/cjx_datawindow.h" +#include "fxjs/xfa/cjx_datawindow.h" #include "xfa/fxfa/parser/cxfa_object.h" class CScript_DataWindow : public CXFA_Object { diff --git a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp index 8f4e049a4f..da7fcb45b8 100644 --- a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp +++ b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cscript_eventpseudomodel.h" -#include "fxjs/cjx_object.h" +#include "fxjs/xfa/cjx_object.h" #include "third_party/base/ptr_util.h" CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument) diff --git a/xfa/fxfa/parser/cscript_eventpseudomodel.h b/xfa/fxfa/parser/cscript_eventpseudomodel.h index 991a538191..efb4df0188 100644 --- a/xfa/fxfa/parser/cscript_eventpseudomodel.h +++ b/xfa/fxfa/parser/cscript_eventpseudomodel.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CSCRIPT_EVENTPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_CSCRIPT_EVENTPSEUDOMODEL_H_ -#include "fxjs/cjx_eventpseudomodel.h" +#include "fxjs/xfa/cjx_eventpseudomodel.h" #include "xfa/fxfa/parser/cxfa_object.h" class CScript_EventPseudoModel : public CXFA_Object { diff --git a/xfa/fxfa/parser/cscript_hostpseudomodel.h b/xfa/fxfa/parser/cscript_hostpseudomodel.h index dc13056091..7e4a37d4d5 100644 --- a/xfa/fxfa/parser/cscript_hostpseudomodel.h +++ b/xfa/fxfa/parser/cscript_hostpseudomodel.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CSCRIPT_HOSTPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_CSCRIPT_HOSTPSEUDOMODEL_H_ -#include "fxjs/cjx_hostpseudomodel.h" +#include "fxjs/xfa/cjx_hostpseudomodel.h" #include "xfa/fxfa/parser/cxfa_object.h" class CXFA_Document; diff --git a/xfa/fxfa/parser/cscript_layoutpseudomodel.h b/xfa/fxfa/parser/cscript_layoutpseudomodel.h index 1662951e75..d76013a06c 100644 --- a/xfa/fxfa/parser/cscript_layoutpseudomodel.h +++ b/xfa/fxfa/parser/cscript_layoutpseudomodel.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CSCRIPT_LAYOUTPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_CSCRIPT_LAYOUTPSEUDOMODEL_H_ -#include "fxjs/cjx_layoutpseudomodel.h" +#include "fxjs/xfa/cjx_layoutpseudomodel.h" #include "xfa/fxfa/parser/cxfa_object.h" class CXFA_LayoutProcessor; diff --git a/xfa/fxfa/parser/cscript_logpseudomodel.h b/xfa/fxfa/parser/cscript_logpseudomodel.h index e6e7960597..9344f203b3 100644 --- a/xfa/fxfa/parser/cscript_logpseudomodel.h +++ b/xfa/fxfa/parser/cscript_logpseudomodel.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CSCRIPT_LOGPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_CSCRIPT_LOGPSEUDOMODEL_H_ -#include "fxjs/cjx_logpseudomodel.h" +#include "fxjs/xfa/cjx_logpseudomodel.h" #include "xfa/fxfa/parser/cxfa_object.h" class CScript_LogPseudoModel : public CXFA_Object { diff --git a/xfa/fxfa/parser/cscript_signaturepseudomodel.h b/xfa/fxfa/parser/cscript_signaturepseudomodel.h index 31c80d86cb..276c1df4ab 100644 --- a/xfa/fxfa/parser/cscript_signaturepseudomodel.h +++ b/xfa/fxfa/parser/cscript_signaturepseudomodel.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CSCRIPT_SIGNATUREPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_CSCRIPT_SIGNATUREPSEUDOMODEL_H_ -#include "fxjs/cjx_signaturepseudomodel.h" +#include "fxjs/xfa/cjx_signaturepseudomodel.h" #include "xfa/fxfa/parser/cxfa_object.h" class CScript_SignaturePseudoModel : public CXFA_Object { diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index 9508daeec9..6079ea7f3f 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -13,7 +13,7 @@ #include #include "core/fxcrt/fx_string.h" -#include "fxjs/cjx_node.h" +#include "fxjs/xfa/cjx_node.h" #include "third_party/base/optional.h" #include "xfa/fxfa/parser/cxfa_object.h" diff --git a/xfa/fxfa/parser/cxfa_thisproxy.cpp b/xfa/fxfa/parser/cxfa_thisproxy.cpp index bbf88a86b7..314c98c9f0 100644 --- a/xfa/fxfa/parser/cxfa_thisproxy.cpp +++ b/xfa/fxfa/parser/cxfa_thisproxy.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_thisproxy.h" -#include "fxjs/cjx_thisproxy.h" +#include "fxjs/xfa/cjx_object.h" #include "third_party/base/ptr_util.h" #include "xfa/fxfa/parser/cxfa_node.h" @@ -15,7 +15,7 @@ CXFA_ThisProxy::CXFA_ThisProxy(CXFA_Node* pThisNode, CXFA_Node* pScriptNode) XFA_ObjectType::VariablesThis, XFA_Element::Unknown, WideStringView(), - pdfium::MakeUnique(this)), + pdfium::MakeUnique(this)), m_pThisNode(pThisNode), m_pScriptNode(pScriptNode) {} diff --git a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp index 865bf8d1ef..1c3ec8ebf7 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp @@ -6,13 +6,13 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "fxjs/cjx_datawindow.h" -#include "fxjs/cjx_eventpseudomodel.h" -#include "fxjs/cjx_hostpseudomodel.h" -#include "fxjs/cjx_layoutpseudomodel.h" -#include "fxjs/cjx_logpseudomodel.h" -#include "fxjs/cjx_node.h" -#include "fxjs/cjx_signaturepseudomodel.h" +#include "fxjs/xfa/cjx_datawindow.h" +#include "fxjs/xfa/cjx_eventpseudomodel.h" +#include "fxjs/xfa/cjx_hostpseudomodel.h" +#include "fxjs/xfa/cjx_layoutpseudomodel.h" +#include "fxjs/xfa/cjx_logpseudomodel.h" +#include "fxjs/xfa/cjx_node.h" +#include "fxjs/xfa/cjx_signaturepseudomodel.h" #include "fxjs/xfa/cjx_tree.h" #include "fxjs/xfa/cjx_treelist.h" #include "xfa/fxfa/fxfa_basic.h" -- cgit v1.2.3