diff options
-rw-r--r-- | BUILD.gn | 22 | ||||
-rw-r--r-- | fpdfsdk/src/javascript/JS_Runtime.cpp | 2 | ||||
-rw-r--r-- | xfa.gyp | 22 | ||||
-rw-r--r-- | xfa/src/fxjse/class.cpp (renamed from xfa/src/fxjse/src/class.cpp) | 10 | ||||
-rw-r--r-- | xfa/src/fxjse/class.h (renamed from xfa/src/fxjse/src/class.h) | 6 | ||||
-rw-r--r-- | xfa/src/fxjse/context.cpp (renamed from xfa/src/fxjse/src/context.cpp) | 10 | ||||
-rw-r--r-- | xfa/src/fxjse/context.h (renamed from xfa/src/fxjse/src/context.h) | 6 | ||||
-rw-r--r-- | xfa/src/fxjse/dynprop.cpp (renamed from xfa/src/fxjse/src/dynprop.cpp) | 4 | ||||
-rw-r--r-- | xfa/src/fxjse/runtime.cpp (renamed from xfa/src/fxjse/src/runtime.cpp) | 4 | ||||
-rw-r--r-- | xfa/src/fxjse/runtime.h (renamed from xfa/src/fxjse/src/runtime.h) | 6 | ||||
-rw-r--r-- | xfa/src/fxjse/scope_inline.h (renamed from xfa/src/fxjse/src/scope_inline.h) | 10 | ||||
-rw-r--r-- | xfa/src/fxjse/util_inline.h (renamed from xfa/src/fxjse/src/util_inline.h) | 8 | ||||
-rw-r--r-- | xfa/src/fxjse/value.cpp (renamed from xfa/src/fxjse/src/value.cpp) | 6 | ||||
-rw-r--r-- | xfa/src/fxjse/value.h (renamed from xfa/src/fxjse/src/value.h) | 8 |
14 files changed, 62 insertions, 62 deletions
@@ -1383,17 +1383,17 @@ if (pdf_enable_xfa) { include_dirs = [ "." ] if (pdf_enable_v8) { sources += [ - "xfa/src/fxjse/src/class.cpp", - "xfa/src/fxjse/src/class.h", - "xfa/src/fxjse/src/context.cpp", - "xfa/src/fxjse/src/context.h", - "xfa/src/fxjse/src/dynprop.cpp", - "xfa/src/fxjse/src/runtime.cpp", - "xfa/src/fxjse/src/runtime.h", - "xfa/src/fxjse/src/scope_inline.h", - "xfa/src/fxjse/src/util_inline.h", - "xfa/src/fxjse/src/value.cpp", - "xfa/src/fxjse/src/value.h", + "xfa/src/fxjse/class.cpp", + "xfa/src/fxjse/class.h", + "xfa/src/fxjse/context.cpp", + "xfa/src/fxjse/context.h", + "xfa/src/fxjse/dynprop.cpp", + "xfa/src/fxjse/runtime.cpp", + "xfa/src/fxjse/runtime.h", + "xfa/src/fxjse/scope_inline.h", + "xfa/src/fxjse/util_inline.h", + "xfa/src/fxjse/value.cpp", + "xfa/src/fxjse/value.h", ] include_dirs += [ "//v8", diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index 88696e5110..dd7ef0f09d 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -30,7 +30,7 @@ #ifdef PDF_ENABLE_XFA #include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" -#include "xfa/src/fxjse/src/value.h" +#include "xfa/src/fxjse/value.h" #endif // PDF_ENABLE_XFA // static @@ -669,17 +669,17 @@ '<(DEPTH)/v8/include', ], 'sources': [ - "xfa/src/fxjse/src/class.cpp", - "xfa/src/fxjse/src/class.h", - "xfa/src/fxjse/src/context.cpp", - "xfa/src/fxjse/src/context.h", - "xfa/src/fxjse/src/dynprop.cpp", - "xfa/src/fxjse/src/runtime.cpp", - "xfa/src/fxjse/src/runtime.h", - "xfa/src/fxjse/src/scope_inline.h", - "xfa/src/fxjse/src/util_inline.h", - "xfa/src/fxjse/src/value.cpp", - "xfa/src/fxjse/src/value.h" + "xfa/src/fxjse/class.cpp", + "xfa/src/fxjse/class.h", + "xfa/src/fxjse/context.cpp", + "xfa/src/fxjse/context.h", + "xfa/src/fxjse/dynprop.cpp", + "xfa/src/fxjse/runtime.cpp", + "xfa/src/fxjse/runtime.h", + "xfa/src/fxjse/scope_inline.h", + "xfa/src/fxjse/util_inline.h", + "xfa/src/fxjse/value.cpp", + "xfa/src/fxjse/value.h" ], }], ["OS == 'win'", { diff --git a/xfa/src/fxjse/src/class.cpp b/xfa/src/fxjse/class.cpp index 57e513cc30..bccbe2ba20 100644 --- a/xfa/src/fxjse/src/class.cpp +++ b/xfa/src/fxjse/class.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fxjse/src/class.h" +#include "xfa/src/fxjse/class.h" -#include "xfa/src/fxjse/src/context.h" -#include "xfa/src/fxjse/src/scope_inline.h" -#include "xfa/src/fxjse/src/util_inline.h" -#include "xfa/src/fxjse/src/value.h" +#include "xfa/src/fxjse/context.h" +#include "xfa/src/fxjse/scope_inline.h" +#include "xfa/src/fxjse/util_inline.h" +#include "xfa/src/fxjse/value.h" static void FXJSE_V8ConstructorCallback_Wrapper( const v8::FunctionCallbackInfo<v8::Value>& info); diff --git a/xfa/src/fxjse/src/class.h b/xfa/src/fxjse/class.h index 3c1780fc58..f5738ebcc6 100644 --- a/xfa/src/fxjse/src/class.h +++ b/xfa/src/fxjse/class.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FXJSE_SRC_CLASS_H_ -#define XFA_SRC_FXJSE_SRC_CLASS_H_ +#ifndef XFA_SRC_FXJSE_CLASS_H_ +#define XFA_SRC_FXJSE_CLASS_H_ #include "v8/include/v8.h" #include "xfa/include/fxjse/fxjse.h" @@ -46,4 +46,4 @@ struct CFXJSE_ArgumentsImpl { CFXJSE_Value* m_pRetValue; }; -#endif // XFA_SRC_FXJSE_SRC_CLASS_H_ +#endif // XFA_SRC_FXJSE_CLASS_H_ diff --git a/xfa/src/fxjse/src/context.cpp b/xfa/src/fxjse/context.cpp index f88fcde2cd..485869d797 100644 --- a/xfa/src/fxjse/src/context.cpp +++ b/xfa/src/fxjse/context.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fxjse/src/context.h" +#include "xfa/src/fxjse/context.h" -#include "xfa/src/fxjse/src/class.h" -#include "xfa/src/fxjse/src/scope_inline.h" -#include "xfa/src/fxjse/src/util_inline.h" -#include "xfa/src/fxjse/src/value.h" +#include "xfa/src/fxjse/class.h" +#include "xfa/src/fxjse/scope_inline.h" +#include "xfa/src/fxjse/util_inline.h" +#include "xfa/src/fxjse/value.h" FXJSE_HCONTEXT FXJSE_Context_Create(FXJSE_HRUNTIME hRuntime, const FXJSE_CLASS* lpGlobalClass, diff --git a/xfa/src/fxjse/src/context.h b/xfa/src/fxjse/context.h index e6c16445cd..cedf11cce6 100644 --- a/xfa/src/fxjse/src/context.h +++ b/xfa/src/fxjse/context.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FXJSE_SRC_CONTEXT_H_ -#define XFA_SRC_FXJSE_SRC_CONTEXT_H_ +#ifndef XFA_SRC_FXJSE_CONTEXT_H_ +#define XFA_SRC_FXJSE_CONTEXT_H_ #include "v8/include/v8.h" #include "xfa/include/fxjse/fxjse.h" @@ -44,4 +44,4 @@ class CFXJSE_Context { v8::Local<v8::Object> FXJSE_CreateReturnValue(v8::Isolate* pIsolate, v8::TryCatch& trycatch); -#endif // XFA_SRC_FXJSE_SRC_CONTEXT_H_ +#endif // XFA_SRC_FXJSE_CONTEXT_H_ diff --git a/xfa/src/fxjse/src/dynprop.cpp b/xfa/src/fxjse/dynprop.cpp index bc423c03c0..55ca6ed8cd 100644 --- a/xfa/src/fxjse/src/dynprop.cpp +++ b/xfa/src/fxjse/dynprop.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fxjse/src/class.h" -#include "xfa/src/fxjse/src/value.h" +#include "xfa/src/fxjse/class.h" +#include "xfa/src/fxjse/value.h" static void FXJSE_DynPropGetterAdapter_MethodCallback( const v8::FunctionCallbackInfo<v8::Value>& info) { diff --git a/xfa/src/fxjse/src/runtime.cpp b/xfa/src/fxjse/runtime.cpp index 99a29c7da4..69a0ed1d5e 100644 --- a/xfa/src/fxjse/src/runtime.cpp +++ b/xfa/src/fxjse/runtime.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fxjse/src/runtime.h" +#include "xfa/src/fxjse/runtime.h" #include "fpdfsdk/include/jsapi/fxjs_v8.h" -#include "xfa/src/fxjse/src/scope_inline.h" +#include "xfa/src/fxjse/scope_inline.h" // Duplicates fpdfsdk's JS_Runtime.h, but keeps XFA from depending on it. // TODO(tsepez): make a single version of this. diff --git a/xfa/src/fxjse/src/runtime.h b/xfa/src/fxjse/runtime.h index 65b7db06c8..a93a589bb4 100644 --- a/xfa/src/fxjse/src/runtime.h +++ b/xfa/src/fxjse/runtime.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FXJSE_SRC_RUNTIME_H_ -#define XFA_SRC_FXJSE_SRC_RUNTIME_H_ +#ifndef XFA_SRC_FXJSE_RUNTIME_H_ +#define XFA_SRC_FXJSE_RUNTIME_H_ #include "core/include/fxcrt/fx_basic.h" #include "v8/include/v8.h" @@ -48,4 +48,4 @@ class CFXJSE_RuntimeList { CFX_ArrayTemplate<v8::Isolate*> m_RuntimeList; }; -#endif // XFA_SRC_FXJSE_SRC_RUNTIME_H_ +#endif // XFA_SRC_FXJSE_RUNTIME_H_ diff --git a/xfa/src/fxjse/src/scope_inline.h b/xfa/src/fxjse/scope_inline.h index 6a7860f93e..6105590966 100644 --- a/xfa/src/fxjse/src/scope_inline.h +++ b/xfa/src/fxjse/scope_inline.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FXJSE_SRC_SCOPE_INLINE_H_ -#define XFA_SRC_FXJSE_SRC_SCOPE_INLINE_H_ +#ifndef XFA_SRC_FXJSE_SCOPE_INLINE_H_ +#define XFA_SRC_FXJSE_SCOPE_INLINE_H_ -#include "xfa/src/fxjse/src/context.h" -#include "xfa/src/fxjse/src/runtime.h" +#include "xfa/src/fxjse/context.h" +#include "xfa/src/fxjse/runtime.h" class CFXJSE_ScopeUtil_IsolateHandle { protected: @@ -105,4 +105,4 @@ class CFXJSE_ScopeUtil_IsolateHandleRootOrNormalContext { void operator delete(void*, size_t); }; -#endif // XFA_SRC_FXJSE_SRC_SCOPE_INLINE_H_ +#endif // XFA_SRC_FXJSE_SCOPE_INLINE_H_ diff --git a/xfa/src/fxjse/src/util_inline.h b/xfa/src/fxjse/util_inline.h index 21520cfbe6..c29c22e1f8 100644 --- a/xfa/src/fxjse/src/util_inline.h +++ b/xfa/src/fxjse/util_inline.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FXJSE_SRC_UTIL_INLINE_H_ -#define XFA_SRC_FXJSE_SRC_UTIL_INLINE_H_ +#ifndef XFA_SRC_FXJSE_UTIL_INLINE_H_ +#define XFA_SRC_FXJSE_UTIL_INLINE_H_ -#include "xfa/src/fxjse/src/context.h" +#include "xfa/src/fxjse/context.h" static V8_INLINE v8::Local<v8::Object> FXJSE_GetGlobalObjectFromContext( const v8::Local<v8::Context>& hContext) { @@ -48,4 +48,4 @@ static V8_INLINE void* FXJSE_RetrieveObjectBinding( return hObject->GetAlignedPointerFromInternalField(0); } -#endif // XFA_SRC_FXJSE_SRC_UTIL_INLINE_H_ +#endif // XFA_SRC_FXJSE_UTIL_INLINE_H_ diff --git a/xfa/src/fxjse/src/value.cpp b/xfa/src/fxjse/value.cpp index 771f757d18..f7b04092d3 100644 --- a/xfa/src/fxjse/src/value.cpp +++ b/xfa/src/fxjse/value.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fxjse/src/value.h" +#include "xfa/src/fxjse/value.h" #include <math.h> -#include "xfa/src/fxjse/src/class.h" -#include "xfa/src/fxjse/src/util_inline.h" +#include "xfa/src/fxjse/class.h" +#include "xfa/src/fxjse/util_inline.h" FX_BOOL FXJSE_Value_IsUndefined(FXJSE_HVALUE hValue) { CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue); diff --git a/xfa/src/fxjse/src/value.h b/xfa/src/fxjse/value.h index 4bda30d6df..55c9c72ce2 100644 --- a/xfa/src/fxjse/src/value.h +++ b/xfa/src/fxjse/value.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FXJSE_SRC_VALUE_H_ -#define XFA_SRC_FXJSE_SRC_VALUE_H_ +#ifndef XFA_SRC_FXJSE_VALUE_H_ +#define XFA_SRC_FXJSE_VALUE_H_ -#include "xfa/src/fxjse/src/scope_inline.h" +#include "xfa/src/fxjse/scope_inline.h" class CFXJSE_Value { public: @@ -238,4 +238,4 @@ class CFXJSE_Value { friend class CFXJSE_Class; }; -#endif // XFA_SRC_FXJSE_SRC_VALUE_H_ +#endif // XFA_SRC_FXJSE_VALUE_H_ |