diff options
Diffstat (limited to 'fpdfsdk')
-rw-r--r-- | fpdfsdk/javascript/Document.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/Field.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/PublicMethods.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/app.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/cjs_event_context.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/cjs_eventhandler.cpp (renamed from fpdfsdk/javascript/JS_EventHandler.cpp) | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/cjs_eventhandler.h (renamed from fpdfsdk/javascript/JS_EventHandler.h) | 8 | ||||
-rw-r--r-- | fpdfsdk/javascript/cjs_global.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/cjs_runtime.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/cjs_runtime.h | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/color.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/console.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/event.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/util.cpp | 2 |
14 files changed, 16 insertions, 18 deletions
diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp index d72f83822b..e4903a5976 100644 --- a/fpdfsdk/javascript/Document.cpp +++ b/fpdfsdk/javascript/Document.cpp @@ -27,12 +27,12 @@ #include "fpdfsdk/javascript/Field.h" #include "fpdfsdk/javascript/Icon.h" #include "fpdfsdk/javascript/JS_Define.h" -#include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_Object.h" #include "fpdfsdk/javascript/JS_Value.h" #include "fpdfsdk/javascript/app.h" #include "fpdfsdk/javascript/cjs_annot.h" #include "fpdfsdk/javascript/cjs_event_context.h" +#include "fpdfsdk/javascript/cjs_eventhandler.h" #include "fpdfsdk/javascript/cjs_runtime.h" #include "fpdfsdk/javascript/resource.h" #include "third_party/base/numerics/safe_math.h" diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp index e79462ff42..1778295249 100644 --- a/fpdfsdk/javascript/Field.cpp +++ b/fpdfsdk/javascript/Field.cpp @@ -22,11 +22,11 @@ #include "fpdfsdk/javascript/Document.h" #include "fpdfsdk/javascript/Icon.h" #include "fpdfsdk/javascript/JS_Define.h" -#include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_Object.h" #include "fpdfsdk/javascript/JS_Value.h" #include "fpdfsdk/javascript/PublicMethods.h" #include "fpdfsdk/javascript/cjs_event_context.h" +#include "fpdfsdk/javascript/cjs_eventhandler.h" #include "fpdfsdk/javascript/cjs_runtime.h" #include "fpdfsdk/javascript/color.h" diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp index 1cf63dc298..ed74c538cf 100644 --- a/fpdfsdk/javascript/PublicMethods.cpp +++ b/fpdfsdk/javascript/PublicMethods.cpp @@ -21,10 +21,10 @@ #include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/javascript/Field.h" #include "fpdfsdk/javascript/JS_Define.h" -#include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_Object.h" #include "fpdfsdk/javascript/JS_Value.h" #include "fpdfsdk/javascript/cjs_event_context.h" +#include "fpdfsdk/javascript/cjs_eventhandler.h" #include "fpdfsdk/javascript/cjs_runtime.h" #include "fpdfsdk/javascript/color.h" #include "fpdfsdk/javascript/resource.h" diff --git a/fpdfsdk/javascript/app.cpp b/fpdfsdk/javascript/app.cpp index 79e4c588df..e65ec2d0b6 100644 --- a/fpdfsdk/javascript/app.cpp +++ b/fpdfsdk/javascript/app.cpp @@ -14,10 +14,10 @@ #include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/javascript/Document.h" #include "fpdfsdk/javascript/JS_Define.h" -#include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_Object.h" #include "fpdfsdk/javascript/JS_Value.h" #include "fpdfsdk/javascript/cjs_event_context.h" +#include "fpdfsdk/javascript/cjs_eventhandler.h" #include "fpdfsdk/javascript/cjs_runtime.h" #include "fpdfsdk/javascript/resource.h" #include "third_party/base/stl_util.h" diff --git a/fpdfsdk/javascript/cjs_event_context.cpp b/fpdfsdk/javascript/cjs_event_context.cpp index bf6b337a70..e02149d176 100644 --- a/fpdfsdk/javascript/cjs_event_context.cpp +++ b/fpdfsdk/javascript/cjs_event_context.cpp @@ -7,7 +7,7 @@ #include "fpdfsdk/javascript/cjs_event_context.h" #include "core/fxcrt/autorestorer.h" -#include "fpdfsdk/javascript/JS_EventHandler.h" +#include "fpdfsdk/javascript/cjs_eventhandler.h" #include "fpdfsdk/javascript/cjs_runtime.h" #include "fpdfsdk/javascript/resource.h" diff --git a/fpdfsdk/javascript/JS_EventHandler.cpp b/fpdfsdk/javascript/cjs_eventhandler.cpp index 670d43ef7c..03d181be62 100644 --- a/fpdfsdk/javascript/JS_EventHandler.cpp +++ b/fpdfsdk/javascript/cjs_eventhandler.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/javascript/JS_EventHandler.h" +#include "fpdfsdk/javascript/cjs_eventhandler.h" #include "fpdfsdk/javascript/Document.h" #include "fpdfsdk/javascript/Field.h" diff --git a/fpdfsdk/javascript/JS_EventHandler.h b/fpdfsdk/javascript/cjs_eventhandler.h index 6f10ba596c..86e017772c 100644 --- a/fpdfsdk/javascript/JS_EventHandler.h +++ b/fpdfsdk/javascript/cjs_eventhandler.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_ -#define FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_ +#ifndef FPDFSDK_JAVASCRIPT_CJS_EVENTHANDLER_H_ +#define FPDFSDK_JAVASCRIPT_CJS_EVENTHANDLER_H_ #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" @@ -140,7 +140,6 @@ class CJS_EventHandler { void OnConsole_Exec(); void OnExternal_Exec(); - public: void Initial(JS_EVENT_T type); void Destroy(); bool IsValid(); @@ -165,7 +164,6 @@ class CJS_EventHandler { JS_EVENT_T EventType() { return m_eEventType; } - public: UnownedPtr<CJS_EventContext> const m_pJSEventContext; JS_EVENT_T m_eEventType; bool m_bValid; @@ -194,4 +192,4 @@ class CJS_EventHandler { CPDFSDK_Annot::ObservedPtr m_pTargetAnnot; }; -#endif // FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_ +#endif // FPDFSDK_JAVASCRIPT_CJS_EVENTHANDLER_H_ diff --git a/fpdfsdk/javascript/cjs_global.cpp b/fpdfsdk/javascript/cjs_global.cpp index f282a2694e..4cf85bd618 100644 --- a/fpdfsdk/javascript/cjs_global.cpp +++ b/fpdfsdk/javascript/cjs_global.cpp @@ -13,12 +13,12 @@ #include "core/fxcrt/fx_extension.h" #include "fpdfsdk/javascript/JS_Define.h" -#include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_GlobalData.h" #include "fpdfsdk/javascript/JS_KeyValue.h" #include "fpdfsdk/javascript/JS_Object.h" #include "fpdfsdk/javascript/JS_Value.h" #include "fpdfsdk/javascript/cjs_event_context.h" +#include "fpdfsdk/javascript/cjs_eventhandler.h" #include "fpdfsdk/javascript/resource.h" #define IMPLEMENT_SPECIAL_JS_CLASS(js_class_name, class_alternate, class_name) \ diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp index e48d696866..c8c8477500 100644 --- a/fpdfsdk/javascript/cjs_runtime.cpp +++ b/fpdfsdk/javascript/cjs_runtime.cpp @@ -13,7 +13,6 @@ #include "fpdfsdk/javascript/Field.h" #include "fpdfsdk/javascript/Icon.h" #include "fpdfsdk/javascript/JS_Define.h" -#include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_GlobalData.h" #include "fpdfsdk/javascript/JS_Object.h" #include "fpdfsdk/javascript/JS_Value.h" @@ -23,6 +22,7 @@ #include "fpdfsdk/javascript/cjs_border.h" #include "fpdfsdk/javascript/cjs_display.h" #include "fpdfsdk/javascript/cjs_event_context.h" +#include "fpdfsdk/javascript/cjs_eventhandler.h" #include "fpdfsdk/javascript/cjs_font.h" #include "fpdfsdk/javascript/cjs_global.h" #include "fpdfsdk/javascript/cjs_globalarrays.h" diff --git a/fpdfsdk/javascript/cjs_runtime.h b/fpdfsdk/javascript/cjs_runtime.h index 69a370501d..ce39c6cc3d 100644 --- a/fpdfsdk/javascript/cjs_runtime.h +++ b/fpdfsdk/javascript/cjs_runtime.h @@ -15,7 +15,7 @@ #include "core/fxcrt/observable.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" -#include "fpdfsdk/javascript/JS_EventHandler.h" +#include "fpdfsdk/javascript/cjs_eventhandler.h" #include "fpdfsdk/javascript/ijs_runtime.h" #include "fxjs/fxjs_v8.h" diff --git a/fpdfsdk/javascript/color.cpp b/fpdfsdk/javascript/color.cpp index 621fe6b752..9ae4b18c90 100644 --- a/fpdfsdk/javascript/color.cpp +++ b/fpdfsdk/javascript/color.cpp @@ -9,10 +9,10 @@ #include <vector> #include "fpdfsdk/javascript/JS_Define.h" -#include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_Object.h" #include "fpdfsdk/javascript/JS_Value.h" #include "fpdfsdk/javascript/cjs_event_context.h" +#include "fpdfsdk/javascript/cjs_eventhandler.h" #include "fpdfsdk/javascript/cjs_runtime.h" JSConstSpec CJS_Color::ConstSpecs[] = {{0, JSConstSpec::Number, 0, 0}}; diff --git a/fpdfsdk/javascript/console.cpp b/fpdfsdk/javascript/console.cpp index af2bb3e9ea..ee7bc7f2bb 100644 --- a/fpdfsdk/javascript/console.cpp +++ b/fpdfsdk/javascript/console.cpp @@ -9,10 +9,10 @@ #include <vector> #include "fpdfsdk/javascript/JS_Define.h" -#include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_Object.h" #include "fpdfsdk/javascript/JS_Value.h" #include "fpdfsdk/javascript/cjs_event_context.h" +#include "fpdfsdk/javascript/cjs_eventhandler.h" JSConstSpec CJS_Console::ConstSpecs[] = {{0, JSConstSpec::Number, 0, 0}}; diff --git a/fpdfsdk/javascript/event.cpp b/fpdfsdk/javascript/event.cpp index 401148c551..2439af2959 100644 --- a/fpdfsdk/javascript/event.cpp +++ b/fpdfsdk/javascript/event.cpp @@ -8,10 +8,10 @@ #include "fpdfsdk/javascript/Field.h" #include "fpdfsdk/javascript/JS_Define.h" -#include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_Object.h" #include "fpdfsdk/javascript/JS_Value.h" #include "fpdfsdk/javascript/cjs_event_context.h" +#include "fpdfsdk/javascript/cjs_eventhandler.h" JSConstSpec CJS_Event::ConstSpecs[] = {{0, JSConstSpec::Number, 0, 0}}; diff --git a/fpdfsdk/javascript/util.cpp b/fpdfsdk/javascript/util.cpp index b9deda1db8..7e08168fba 100644 --- a/fpdfsdk/javascript/util.cpp +++ b/fpdfsdk/javascript/util.cpp @@ -16,11 +16,11 @@ #include "core/fxcrt/fx_extension.h" #include "fpdfsdk/javascript/JS_Define.h" -#include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_Object.h" #include "fpdfsdk/javascript/JS_Value.h" #include "fpdfsdk/javascript/PublicMethods.h" #include "fpdfsdk/javascript/cjs_event_context.h" +#include "fpdfsdk/javascript/cjs_eventhandler.h" #include "fpdfsdk/javascript/cjs_runtime.h" #include "fpdfsdk/javascript/resource.h" |