diff options
43 files changed, 131 insertions, 141 deletions
@@ -34,8 +34,8 @@ config("pdfium_common_config") { config("pdfium_core_config") { cflags = [] - configs = [":pdfium_common_config"] - defines = ["V8_DEPRECATION_WARNINGS"] + configs = [ ":pdfium_common_config" ] + defines = [ "V8_DEPRECATION_WARNINGS" ] if (is_linux) { if (current_cpu == "x64") { defines += [ "_FX_CPU_=_FX_X64_" ] @@ -893,6 +893,18 @@ if (pdf_enable_xfa) { static_library("xfa") { sources = [ + "fxjse/class.cpp", + "fxjse/context.cpp", + "fxjse/context.h", + "fxjse/dynprop.cpp", + "fxjse/include/cfxjse_arguments.h", + "fxjse/include/cfxjse_class.h", + "fxjse/include/cfxjse_value.h", + "fxjse/include/fxjse.h", + "fxjse/runtime.cpp", + "fxjse/runtime.h", + "fxjse/scope_inline.h", + "fxjse/value.cpp", "xfa/fde/cfde_path.cpp", "xfa/fde/cfde_path.h", "xfa/fde/cfde_txtedtbuf.cpp", @@ -1560,34 +1572,18 @@ if (pdf_enable_xfa) { "xfa/fxgraphics/cfx_shading.cpp", "xfa/fxgraphics/cfx_shading.h", "xfa/fxgraphics/include/cfx_graphics.h", - "xfa/fxjse/include/fxjse.h", ] - include_dirs = [ "." ] - if (pdf_enable_v8) { - sources += [ - "xfa/fxjse/cfxjse_arguments.h", - "xfa/fxjse/class.cpp", - "xfa/fxjse/class.h", - "xfa/fxjse/context.cpp", - "xfa/fxjse/context.h", - "xfa/fxjse/dynprop.cpp", - "xfa/fxjse/runtime.cpp", - "xfa/fxjse/runtime.h", - "xfa/fxjse/scope_inline.h", - "xfa/fxjse/value.cpp", - "xfa/fxjse/value.h", - ] - include_dirs += [ - "//v8", - "//v8/include", - ] - public_deps = [ - "//v8", - ] - deps = [ - "//v8:v8_libplatform", - ] - } + include_dirs = [ + ".", + "//v8", + "//v8/include", + ] + public_deps = [ + "//v8", + ] + deps = [ + "//v8:v8_libplatform", + ] configs += [ ":pdfium_core_config", ":xfa_warnings", diff --git a/fpdfsdk/javascript/DEPS b/fpdfsdk/javascript/DEPS index 80f4b768d9..3adc40c859 100644 --- a/fpdfsdk/javascript/DEPS +++ b/fpdfsdk/javascript/DEPS @@ -1,5 +1,5 @@ include_rules = [ '+core/fdrm/crypto/include', '+core/fpdfapi/fpdf_font/include', - '+xfa/fxjse' + '+fxjse/include' ] diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp index 503392fe63..fcdbfcfb4d 100644 --- a/fpdfsdk/javascript/cjs_runtime.cpp +++ b/fpdfsdk/javascript/cjs_runtime.cpp @@ -31,7 +31,7 @@ #ifdef PDF_ENABLE_XFA #include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" -#include "xfa/fxjse/value.h" +#include "fxjse/include/cfxjse_value.h" #endif // PDF_ENABLE_XFA // static diff --git a/fpdfsdk/javascript/ijs_runtime.h b/fpdfsdk/javascript/ijs_runtime.h index 19a440e6ed..4083f86e87 100644 --- a/fpdfsdk/javascript/ijs_runtime.h +++ b/fpdfsdk/javascript/ijs_runtime.h @@ -11,7 +11,7 @@ #include "core/fxcrt/include/fx_system.h" #ifdef PDF_ENABLE_XFA -#include "xfa/fxjse/include/fxjse.h" +#include "fxjse/include/fxjse.h" #endif // PDF_ENABLE_XFA class CPDFDoc_Environment; diff --git a/fxjse/DEPS b/fxjse/DEPS new file mode 100644 index 0000000000..18698e4ce4 --- /dev/null +++ b/fxjse/DEPS @@ -0,0 +1,6 @@ +include_rules = [ + '+core/fxcrt/include', + # TODO(dsinclair): Layering violation. FXJSE can't include FPDFSDK. + '+fpdfsdk/jsapi/include', + '+v8/include', +] diff --git a/xfa/fxjse/class.cpp b/fxjse/class.cpp index e9d67d8cda..bb133fba58 100644 --- a/xfa/fxjse/class.cpp +++ b/fxjse/class.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxjse/class.h" +#include "fxjse/include/cfxjse_class.h" -#include "xfa/fxjse/cfxjse_arguments.h" -#include "xfa/fxjse/context.h" -#include "xfa/fxjse/scope_inline.h" -#include "xfa/fxjse/value.h" +#include "fxjse/context.h" +#include "fxjse/include/cfxjse_arguments.h" +#include "fxjse/include/cfxjse_value.h" +#include "fxjse/scope_inline.h" static void FXJSE_V8ConstructorCallback_Wrapper( const v8::FunctionCallbackInfo<v8::Value>& info); diff --git a/xfa/fxjse/context.cpp b/fxjse/context.cpp index e5d5f994d5..3ecc3e2321 100644 --- a/xfa/fxjse/context.cpp +++ b/fxjse/context.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxjse/context.h" +#include "fxjse/context.h" -#include "xfa/fxjse/class.h" -#include "xfa/fxjse/scope_inline.h" -#include "xfa/fxjse/value.h" +#include "fxjse/include/cfxjse_class.h" +#include "fxjse/include/cfxjse_value.h" +#include "fxjse/scope_inline.h" namespace { diff --git a/xfa/fxjse/context.h b/fxjse/context.h index 0bb1e4fa26..91356a09b8 100644 --- a/xfa/fxjse/context.h +++ b/fxjse/context.h @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXJSE_CONTEXT_H_ -#define XFA_FXJSE_CONTEXT_H_ +#ifndef FXJSE_CONTEXT_H_ +#define FXJSE_CONTEXT_H_ #include <memory> #include <vector> #include "core/fxcrt/include/fx_basic.h" +#include "fxjse/include/fxjse.h" #include "v8/include/v8.h" -#include "xfa/fxjse/include/fxjse.h" class CFXJSE_Class; class CFXJSE_Value; @@ -60,4 +60,4 @@ CFXJSE_HostObject* FXJSE_RetrieveObjectBinding( const v8::Local<v8::Object>& hJSObject, CFXJSE_Class* lpClass = nullptr); -#endif // XFA_FXJSE_CONTEXT_H_ +#endif // FXJSE_CONTEXT_H_ diff --git a/xfa/fxjse/dynprop.cpp b/fxjse/dynprop.cpp index 946fe42c1b..34f63f4338 100644 --- a/xfa/fxjse/dynprop.cpp +++ b/fxjse/dynprop.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxjse/cfxjse_arguments.h" -#include "xfa/fxjse/class.h" -#include "xfa/fxjse/value.h" +#include "fxjse/include/cfxjse_arguments.h" +#include "fxjse/include/cfxjse_class.h" +#include "fxjse/include/cfxjse_value.h" static void FXJSE_DynPropGetterAdapter_MethodCallback( const v8::FunctionCallbackInfo<v8::Value>& info) { diff --git a/xfa/fxjse/cfxjse_arguments.h b/fxjse/include/cfxjse_arguments.h index 7091f8dea6..0f9bddaa87 100644 --- a/xfa/fxjse/cfxjse_arguments.h +++ b/fxjse/include/cfxjse_arguments.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXJSE_CFXJSE_ARGUMENTS_H_ -#define XFA_FXJSE_CFXJSE_ARGUMENTS_H_ +#ifndef FXJSE_INCLUDE_CFXJSE_ARGUMENTS_H_ +#define FXJSE_INCLUDE_CFXJSE_ARGUMENTS_H_ #include <memory> -#include "xfa/fxjse/include/fxjse.h" +#include "fxjse/include/fxjse.h" class CFXJSE_Class; @@ -35,4 +35,4 @@ class CFXJSE_Arguments { CFXJSE_Value* m_pRetValue; }; -#endif // XFA_FXJSE_CFXJSE_ARGUMENTS_H_ +#endif // FXJSE_INCLUDE_CFXJSE_ARGUMENTS_H_ diff --git a/xfa/fxjse/class.h b/fxjse/include/cfxjse_class.h index a28d36801e..bb1db6d48c 100644 --- a/xfa/fxjse/class.h +++ b/fxjse/include/cfxjse_class.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXJSE_CLASS_H_ -#define XFA_FXJSE_CLASS_H_ +#ifndef FXJSE_INCLUDE_CFXJSE_CLASS_H_ +#define FXJSE_INCLUDE_CFXJSE_CLASS_H_ +#include "fxjse/include/cfxjse_arguments.h" +#include "fxjse/include/fxjse.h" #include "v8/include/v8.h" -#include "xfa/fxjse/cfxjse_arguments.h" -#include "xfa/fxjse/include/fxjse.h" class CFXJSE_Context; class CFXJSE_Value; @@ -41,4 +41,4 @@ class CFXJSE_Class { friend class CFXJSE_Value; }; -#endif // XFA_FXJSE_CLASS_H_ +#endif // FXJSE_INCLUDE_CFXJSE_CLASS_H_ diff --git a/xfa/fxjse/value.h b/fxjse/include/cfxjse_value.h index d74fc325dd..e01f64cfff 100644 --- a/xfa/fxjse/value.h +++ b/fxjse/include/cfxjse_value.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXJSE_VALUE_H_ -#define XFA_FXJSE_VALUE_H_ +#ifndef FXJSE_INCLUDE_CFXJSE_VALUE_H_ +#define FXJSE_INCLUDE_CFXJSE_VALUE_H_ -#include "xfa/fxjse/scope_inline.h" +#include "fxjse/scope_inline.h" V8_INLINE static double FXJSE_ftod(FX_FLOAT fNumber) { if (sizeof(FX_FLOAT) != 4) { @@ -281,4 +281,4 @@ class CFXJSE_Value { v8::Global<v8::Value> m_hValue; }; -#endif // XFA_FXJSE_VALUE_H_ +#endif // FXJSE_INCLUDE_CFXJSE_VALUE_H_ diff --git a/xfa/fxjse/include/fxjse.h b/fxjse/include/fxjse.h index 8f30faac30..f9d6a67e02 100644 --- a/xfa/fxjse/include/fxjse.h +++ b/fxjse/include/fxjse.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXJSE_INCLUDE_FXJSE_H_ -#define XFA_FXJSE_INCLUDE_FXJSE_H_ +#ifndef FXJSE_INCLUDE_FXJSE_H_ +#define FXJSE_INCLUDE_FXJSE_H_ #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" @@ -71,4 +71,4 @@ void FXJSE_Runtime_Release(v8::Isolate* pIsolate); void FXJSE_ThrowMessage(const CFX_ByteStringC& utf8Message); -#endif // XFA_FXJSE_INCLUDE_FXJSE_H_ +#endif // FXJSE_INCLUDE_FXJSE_H_ diff --git a/xfa/fxjse/runtime.cpp b/fxjse/runtime.cpp index c3d12c3745..bf171eef7e 100644 --- a/xfa/fxjse/runtime.cpp +++ b/fxjse/runtime.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxjse/runtime.h" +#include "fxjse/runtime.h" #include <algorithm> #include "fpdfsdk/jsapi/include/fxjs_v8.h" -#include "xfa/fxjse/scope_inline.h" +#include "fxjse/scope_inline.h" // Duplicates fpdfsdk's cjs_runtime.h, but keeps XFA from depending on it. // TODO(tsepez): make a single version of this. diff --git a/xfa/fxjse/runtime.h b/fxjse/runtime.h index b57efe1df7..e3b4113a50 100644 --- a/xfa/fxjse/runtime.h +++ b/fxjse/runtime.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXJSE_RUNTIME_H_ -#define XFA_FXJSE_RUNTIME_H_ +#ifndef FXJSE_RUNTIME_H_ +#define FXJSE_RUNTIME_H_ #include <vector> @@ -43,4 +43,4 @@ class CFXJSE_IsolateTracker { std::vector<v8::Isolate*> m_OwnedIsolates; }; -#endif // XFA_FXJSE_RUNTIME_H_ +#endif // FXJSE_RUNTIME_H_ diff --git a/xfa/fxjse/scope_inline.h b/fxjse/scope_inline.h index 8ef9c85530..64eb6a79bf 100644 --- a/xfa/fxjse/scope_inline.h +++ b/fxjse/scope_inline.h @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXJSE_SCOPE_INLINE_H_ -#define XFA_FXJSE_SCOPE_INLINE_H_ +#ifndef FXJSE_SCOPE_INLINE_H_ +#define FXJSE_SCOPE_INLINE_H_ -#include "xfa/fxjse/context.h" -#include "xfa/fxjse/runtime.h" +#include "fxjse/context.h" +#include "fxjse/runtime.h" class CFXJSE_ScopeUtil_IsolateHandle { public: explicit CFXJSE_ScopeUtil_IsolateHandle(v8::Isolate* pIsolate) - : m_isolate(pIsolate), - m_iscope(pIsolate), - m_hscope(pIsolate) {} + : m_isolate(pIsolate), m_iscope(pIsolate), m_hscope(pIsolate) {} v8::Isolate* GetIsolate() { return m_isolate; } private: @@ -74,4 +72,4 @@ class CFXJSE_ScopeUtil_IsolateHandleContext { v8::Context::Scope m_cscope; }; -#endif // XFA_FXJSE_SCOPE_INLINE_H_ +#endif // FXJSE_SCOPE_INLINE_H_ diff --git a/xfa/fxjse/value.cpp b/fxjse/value.cpp index af73a19ead..a49ee312f3 100644 --- a/xfa/fxjse/value.cpp +++ b/fxjse/value.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxjse/value.h" +#include "fxjse/include/cfxjse_value.h" #include <math.h> -#include "xfa/fxjse/class.h" -#include "xfa/fxjse/context.h" +#include "fxjse/context.h" +#include "fxjse/include/cfxjse_class.h" void FXJSE_ThrowMessage(const CFX_ByteStringC& utf8Message) { v8::Isolate* pIsolate = v8::Isolate::GetCurrent(); @@ -21,11 +21,31 @@ '.', 'third_party/freetype/include', 'third_party/freetype/include/freetype', + '<(DEPTH)/v8', + '<(DEPTH)/v8/include', ], 'defines' : [ 'FT2_BUILD_LIBRARY', ], + 'dependencies': [ + '<(DEPTH)/v8/src/v8.gyp:v8', + ], + 'export_dependent_settings': [ + '<(DEPTH)/v8/src/v8.gyp:v8', + ], "sources":[ + "fxjse/class.cpp", + "fxjse/context.cpp", + "fxjse/context.h", + "fxjse/dynprop.cpp", + "fxjse/include/cfxjse_arguments.h", + "fxjse/include/cfxjse_class.h", + "fxjse/include/cfxjse_value.h" + "fxjse/include/fxjse.h", + "fxjse/runtime.cpp", + "fxjse/runtime.h", + "fxjse/scope_inline.h", + "fxjse/value.cpp", "xfa/fxfa/include/fxfa.h", "xfa/fxfa/include/fxfa_basic.h", "xfa/fxfa/include/fxfa_widget.h", @@ -693,39 +713,11 @@ "xfa/fxgraphics/cfx_shading.cpp", "xfa/fxgraphics/cfx_shading.h", "xfa/fxgraphics/include/cfx_graphics.h", - "xfa/fxjse/include/fxjse.h", ], "conditions": [ - ["clang==1" , { - }], ["os_posix==1 and clang==0", { # When GCC 'cflags': [ '-Wno-strict-overflow' ], }], - ["pdf_enable_v8==1", { - 'dependencies': [ - '<(DEPTH)/v8/src/v8.gyp:v8', - ], - 'export_dependent_settings': [ - '<(DEPTH)/v8/src/v8.gyp:v8', - ], - 'include_dirs': [ - '<(DEPTH)/v8', - '<(DEPTH)/v8/include', - ], - 'sources': [ - "xfa/fxjse/cfxjse_arguments.h", - "xfa/fxjse/class.cpp", - "xfa/fxjse/class.h", - "xfa/fxjse/context.cpp", - "xfa/fxjse/context.h", - "xfa/fxjse/dynprop.cpp", - "xfa/fxjse/runtime.cpp", - "xfa/fxjse/runtime.h", - "xfa/fxjse/scope_inline.h", - "xfa/fxjse/value.cpp", - "xfa/fxjse/value.h" - ], - }], ["OS == 'win'", { "configurations": { "Debug": { diff --git a/xfa/fxfa/DEPS b/xfa/fxfa/DEPS new file mode 100644 index 0000000000..19fdfab516 --- /dev/null +++ b/xfa/fxfa/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + '+fxjse/include', +] diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp index c801bb45e5..6c4daeb233 100644 --- a/xfa/fxfa/app/xfa_ffnotify.cpp +++ b/xfa/fxfa/app/xfa_ffnotify.cpp @@ -6,6 +6,7 @@ #include "xfa/fxfa/app/xfa_ffnotify.h" +#include "fxjse/include/cfxjse_value.h" #include "xfa/fxfa/app/xfa_ffbarcode.h" #include "xfa/fxfa/app/xfa_ffcheckbutton.h" #include "xfa/fxfa/app/xfa_ffchoicelist.h" @@ -29,7 +30,6 @@ #include "xfa/fxfa/include/xfa_ffpageview.h" #include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxfa/include/xfa_ffwidgethandler.h" -#include "xfa/fxjse/value.h" static void XFA_FFDeleteWidgetAcc(void* pData) { delete static_cast<CXFA_WidgetAcc*>(pData); diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp index 59e3805991..6a4a1f4f6f 100644 --- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp +++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp @@ -9,6 +9,7 @@ #include <algorithm> #include <memory> +#include "fxjse/include/cfxjse_value.h" #include "xfa/fde/tto/fde_textout.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fxfa/app/xfa_ffcheckbutton.h" @@ -26,7 +27,6 @@ #include "xfa/fxfa/parser/xfa_localevalue.h" #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_script_imp.h" -#include "xfa/fxjse/value.h" static void XFA_FFDeleteCalcData(void* pData) { if (pData) { diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp index 42aa5279b7..88e3527b94 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp @@ -9,6 +9,9 @@ #include <time.h> #include "core/fxcrt/include/fx_ext.h" +#include "fxjse/include/cfxjse_arguments.h" +#include "fxjse/include/cfxjse_class.h" +#include "fxjse/include/cfxjse_value.h" #include "xfa/fgas/localization/fgas_locale.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/fm2js/xfa_program.h" @@ -17,9 +20,6 @@ #include "xfa/fxfa/parser/xfa_parser.h" #include "xfa/fxfa/parser/xfa_parser_imp.h" #include "xfa/fxfa/parser/xfa_script_imp.h" -#include "xfa/fxjse/cfxjse_arguments.h" -#include "xfa/fxjse/class.h" -#include "xfa/fxjse/value.h" namespace { diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.h b/xfa/fxfa/fm2js/xfa_fm2jscontext.h index 59137f0907..eb16435f12 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.h +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_ #define XFA_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_ +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_script.h" -#include "xfa/fxjse/cfxjse_arguments.h" class CXFA_FM2JSContext : public CFXJSE_HostObject { public: diff --git a/xfa/fxfa/include/fxfa_basic.h b/xfa/fxfa/include/fxfa_basic.h index e1aa67447e..05e152acac 100644 --- a/xfa/fxfa/include/fxfa_basic.h +++ b/xfa/fxfa/include/fxfa_basic.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_INCLUDE_FXFA_BASIC_H_ #define XFA_FXFA_INCLUDE_FXFA_BASIC_H_ -#include "xfa/fxjse/cfxjse_arguments.h" -#include "xfa/fxjse/include/fxjse.h" +#include "fxjse/include/cfxjse_arguments.h" +#include "fxjse/include/fxjse.h" class CXFA_Measurement; diff --git a/xfa/fxfa/parser/cxfa_valuearray.h b/xfa/fxfa/parser/cxfa_valuearray.h index b2825fa53a..3907b4dbbd 100644 --- a/xfa/fxfa/parser/cxfa_valuearray.h +++ b/xfa/fxfa/parser/cxfa_valuearray.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_ #define XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_ +#include "fxjse/include/cfxjse_value.h" #include "xfa/fxfa/include/fxfa.h" -#include "xfa/fxjse/value.h" class CXFA_ValueArray : public CFX_ArrayTemplate<CFXJSE_Value*> { public: diff --git a/xfa/fxfa/parser/xfa_object.h b/xfa/fxfa/parser/xfa_object.h index c4eaa4cc60..2cd09df15c 100644 --- a/xfa/fxfa/parser/xfa_object.h +++ b/xfa/fxfa/parser/xfa_object.h @@ -9,9 +9,9 @@ #include <unordered_set> +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fde/xml/fde_xml.h" #include "xfa/fxfa/parser/xfa_utils.h" -#include "xfa/fxjse/cfxjse_arguments.h" class CXFA_Document; class CXFA_Node; diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp index fe08c0e42b..10bac30708 100644 --- a/xfa/fxfa/parser/xfa_object_imp.cpp +++ b/xfa/fxfa/parser/xfa_object_imp.cpp @@ -9,6 +9,7 @@ #include <memory> #include "core/fxcrt/include/fx_ext.h" +#include "fxjse/include/cfxjse_arguments.h" #include "third_party/base/stl_util.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fgas/crt/fgas_codepage.h" @@ -25,7 +26,6 @@ #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_script_imp.h" #include "xfa/fxfa/parser/xfa_utils.h" -#include "xfa/fxjse/cfxjse_arguments.h" namespace { diff --git a/xfa/fxfa/parser/xfa_script.h b/xfa/fxfa/parser/xfa_script.h index e81a7b9754..646193d2cf 100644 --- a/xfa/fxfa/parser/xfa_script.h +++ b/xfa/fxfa/parser/xfa_script.h @@ -7,9 +7,9 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_H_ +#include "fxjse/include/cfxjse_value.h" #include "xfa/fxfa/include/fxfa.h" #include "xfa/fxfa/parser/cxfa_valuearray.h" -#include "xfa/fxjse/value.h" #define XFA_RESOLVENODE_Children 0x0001 #define XFA_RESOLVENODE_Attributes 0x0004 diff --git a/xfa/fxfa/parser/xfa_script_datawindow.cpp b/xfa/fxfa/parser/xfa_script_datawindow.cpp index e28049cb82..d825ee634f 100644 --- a/xfa/fxfa/parser/xfa_script_datawindow.cpp +++ b/xfa/fxfa/parser/xfa_script_datawindow.cpp @@ -6,6 +6,7 @@ #include "xfa/fxfa/parser/xfa_script_datawindow.h" +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_doclayout.h" #include "xfa/fxfa/parser/xfa_document.h" #include "xfa/fxfa/parser/xfa_localemgr.h" @@ -13,7 +14,6 @@ #include "xfa/fxfa/parser/xfa_parser.h" #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_utils.h" -#include "xfa/fxjse/cfxjse_arguments.h" CScript_DataWindow::CScript_DataWindow(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_DataWindow) { diff --git a/xfa/fxfa/parser/xfa_script_datawindow.h b/xfa/fxfa/parser/xfa_script_datawindow.h index 55d12f8441..7754f049c4 100644 --- a/xfa/fxfa/parser/xfa_script_datawindow.h +++ b/xfa/fxfa/parser/xfa_script_datawindow.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_DATAWINDOW_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_DATAWINDOW_H_ +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_object.h" -#include "xfa/fxjse/cfxjse_arguments.h" class CScript_DataWindow : public CXFA_OrdinaryObject { public: diff --git a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp index 2a0c291e16..d4ef935ada 100644 --- a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp @@ -6,6 +6,7 @@ #include "xfa/fxfa/parser/xfa_script_eventpseudomodel.h" +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/include/xfa_ffwidgethandler.h" #include "xfa/fxfa/parser/xfa_doclayout.h" @@ -17,7 +18,6 @@ #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_script_imp.h" #include "xfa/fxfa/parser/xfa_utils.h" -#include "xfa/fxjse/cfxjse_arguments.h" CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_EventPseudoModel) { diff --git a/xfa/fxfa/parser/xfa_script_eventpseudomodel.h b/xfa/fxfa/parser/xfa_script_eventpseudomodel.h index f7649eb643..378f56f149 100644 --- a/xfa/fxfa/parser/xfa_script_eventpseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_eventpseudomodel.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_ +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_object.h" -#include "xfa/fxjse/cfxjse_arguments.h" enum class XFA_Event { Change = 0, diff --git a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp index ef2bafb81e..63bed46747 100644 --- a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp @@ -6,6 +6,7 @@ #include "xfa/fxfa/parser/xfa_script_hostpseudomodel.h" +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/parser/xfa_doclayout.h" #include "xfa/fxfa/parser/xfa_document.h" @@ -17,7 +18,6 @@ #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_script_imp.h" #include "xfa/fxfa/parser/xfa_utils.h" -#include "xfa/fxjse/cfxjse_arguments.h" namespace { diff --git a/xfa/fxfa/parser/xfa_script_hostpseudomodel.h b/xfa/fxfa/parser/xfa_script_hostpseudomodel.h index 7ead797669..8a186fb6fd 100644 --- a/xfa/fxfa/parser/xfa_script_hostpseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_hostpseudomodel.h @@ -7,9 +7,9 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_ +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_document.h" #include "xfa/fxfa/parser/xfa_object.h" -#include "xfa/fxjse/cfxjse_arguments.h" class CScript_HostPseudoModel : public CXFA_OrdinaryObject { public: diff --git a/xfa/fxfa/parser/xfa_script_imp.cpp b/xfa/fxfa/parser/xfa_script_imp.cpp index fe8400515f..6dc4d3b9f0 100644 --- a/xfa/fxfa/parser/xfa_script_imp.cpp +++ b/xfa/fxfa/parser/xfa_script_imp.cpp @@ -7,6 +7,9 @@ #include "xfa/fxfa/parser/xfa_script_imp.h" #include "core/fxcrt/include/fx_ext.h" +#include "fxjse/include/cfxjse_arguments.h" +#include "fxjse/include/cfxjse_class.h" +#include "fxjse/include/cfxjse_value.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/parser/xfa_doclayout.h" #include "xfa/fxfa/parser/xfa_document.h" @@ -17,9 +20,6 @@ #include "xfa/fxfa/parser/xfa_script_nodehelper.h" #include "xfa/fxfa/parser/xfa_script_resolveprocessor.h" #include "xfa/fxfa/parser/xfa_utils.h" -#include "xfa/fxjse/cfxjse_arguments.h" -#include "xfa/fxjse/class.h" -#include "xfa/fxjse/value.h" namespace { diff --git a/xfa/fxfa/parser/xfa_script_imp.h b/xfa/fxfa/parser/xfa_script_imp.h index 86d3f3703a..64d1e1a6d7 100644 --- a/xfa/fxfa/parser/xfa_script_imp.h +++ b/xfa/fxfa/parser/xfa_script_imp.h @@ -9,10 +9,10 @@ #include <map> +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fxfa/fm2js/xfa_fm2jscontext.h" #include "xfa/fxfa/parser/xfa_document.h" #include "xfa/fxfa/parser/xfa_script.h" -#include "xfa/fxjse/cfxjse_arguments.h" #define XFA_RESOLVENODE_TagName 0x0002 diff --git a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp index 37c64b6b05..bac3c18514 100644 --- a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp @@ -8,6 +8,7 @@ #include <set> +#include "fxjse/include/cfxjse_arguments.h" #include "third_party/base/stl_util.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/parser/xfa_doclayout.h" @@ -21,7 +22,6 @@ #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_script_imp.h" #include "xfa/fxfa/parser/xfa_utils.h" -#include "xfa/fxjse/cfxjse_arguments.h" CScript_LayoutPseudoModel::CScript_LayoutPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LayoutPseudoModel) { diff --git a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.h b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.h index 5063153767..2fb0dba303 100644 --- a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.h @@ -7,9 +7,9 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_ +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_doclayout.h" #include "xfa/fxfa/parser/xfa_object.h" -#include "xfa/fxjse/cfxjse_arguments.h" enum XFA_LAYOUTMODEL_HWXY { XFA_LAYOUTMODEL_H, diff --git a/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp index 977fe406d5..ea94ca996d 100644 --- a/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp @@ -6,6 +6,7 @@ #include "xfa/fxfa/parser/xfa_script_logpseudomodel.h" +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_doclayout.h" #include "xfa/fxfa/parser/xfa_document.h" #include "xfa/fxfa/parser/xfa_localemgr.h" @@ -13,7 +14,6 @@ #include "xfa/fxfa/parser/xfa_parser.h" #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_utils.h" -#include "xfa/fxjse/cfxjse_arguments.h" CScript_LogPseudoModel::CScript_LogPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LogPseudoModel) { diff --git a/xfa/fxfa/parser/xfa_script_logpseudomodel.h b/xfa/fxfa/parser/xfa_script_logpseudomodel.h index e7138fe142..1e13cd0371 100644 --- a/xfa/fxfa/parser/xfa_script_logpseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_logpseudomodel.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_ +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_object.h" -#include "xfa/fxjse/cfxjse_arguments.h" class CScript_LogPseudoModel : public CXFA_OrdinaryObject { public: diff --git a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp index d8e35bfbb4..845317c5f8 100644 --- a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp @@ -6,6 +6,7 @@ #include "xfa/fxfa/parser/xfa_script_signaturepseudomodel.h" +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/parser/xfa_doclayout.h" #include "xfa/fxfa/parser/xfa_document.h" @@ -16,7 +17,6 @@ #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_script_imp.h" #include "xfa/fxfa/parser/xfa_utils.h" -#include "xfa/fxjse/cfxjse_arguments.h" CScript_SignaturePseudoModel::CScript_SignaturePseudoModel( CXFA_Document* pDocument) diff --git a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.h b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.h index 5ca6df1d91..bba0fd5827 100644 --- a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_ +#include "fxjse/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_object.h" -#include "xfa/fxjse/cfxjse_arguments.h" class CScript_SignaturePseudoModel : public CXFA_OrdinaryObject { public: diff --git a/xfa/fxjse/DEPS b/xfa/fxjse/DEPS deleted file mode 100644 index 3b4b780a7d..0000000000 --- a/xfa/fxjse/DEPS +++ /dev/null @@ -1,5 +0,0 @@ -include_rules = [ - # TODO(dsinclair): Layering violation. XFA can't include FPDFSDK. - '+fpdfsdk/jsapi/include', - '+v8/include', -] |