diff options
| -rw-r--r-- | BUILD.gn | 4 | ||||
| -rw-r--r-- | fpdfsdk/javascript/cjs_document.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/javascript/cjs_field.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/javascript/cjs_icon.cpp (renamed from fpdfsdk/javascript/Icon.cpp) | 6 | ||||
| -rw-r--r-- | fpdfsdk/javascript/cjs_icon.h (renamed from fpdfsdk/javascript/Icon.h) | 8 | ||||
| -rw-r--r-- | fpdfsdk/javascript/cjs_runtime.cpp | 2 |
6 files changed, 9 insertions, 15 deletions
@@ -1188,8 +1188,6 @@ static_library("javascript") { if (pdf_enable_v8) { sources += [ - "fpdfsdk/javascript/Icon.cpp", - "fpdfsdk/javascript/Icon.h", "fpdfsdk/javascript/JS_Define.h", "fpdfsdk/javascript/JS_GlobalData.cpp", "fpdfsdk/javascript/JS_GlobalData.h", @@ -1229,6 +1227,8 @@ static_library("javascript") { "fpdfsdk/javascript/cjs_globalconsts.h", "fpdfsdk/javascript/cjs_highlight.cpp", "fpdfsdk/javascript/cjs_highlight.h", + "fpdfsdk/javascript/cjs_icon.cpp", + "fpdfsdk/javascript/cjs_icon.h", "fpdfsdk/javascript/cjs_position.cpp", "fpdfsdk/javascript/cjs_position.h", "fpdfsdk/javascript/cjs_printparamsobj.cpp", diff --git a/fpdfsdk/javascript/cjs_document.cpp b/fpdfsdk/javascript/cjs_document.cpp index abbc61be61..df7001bd8f 100644 --- a/fpdfsdk/javascript/cjs_document.cpp +++ b/fpdfsdk/javascript/cjs_document.cpp @@ -19,11 +19,11 @@ #include "fpdfsdk/cpdfsdk_annotiteration.h" #include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/cpdfsdk_pageview.h" -#include "fpdfsdk/javascript/Icon.h" #include "fpdfsdk/javascript/app.h" #include "fpdfsdk/javascript/cjs_annot.h" #include "fpdfsdk/javascript/cjs_delaydata.h" #include "fpdfsdk/javascript/cjs_field.h" +#include "fpdfsdk/javascript/cjs_icon.h" #include "fpdfsdk/javascript/cjs_printparamsobj.h" const JSPropertySpec CJS_Document::PropertySpecs[] = { diff --git a/fpdfsdk/javascript/cjs_field.cpp b/fpdfsdk/javascript/cjs_field.cpp index 110c8ee51a..4de5da1747 100644 --- a/fpdfsdk/javascript/cjs_field.cpp +++ b/fpdfsdk/javascript/cjs_field.cpp @@ -15,9 +15,9 @@ #include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/cpdfsdk_widget.h" -#include "fpdfsdk/javascript/Icon.h" #include "fpdfsdk/javascript/cjs_delaydata.h" #include "fpdfsdk/javascript/cjs_document.h" +#include "fpdfsdk/javascript/cjs_icon.h" #include "fpdfsdk/javascript/color.h" namespace { diff --git a/fpdfsdk/javascript/Icon.cpp b/fpdfsdk/javascript/cjs_icon.cpp index df7561ea8b..2606b8213d 100644 --- a/fpdfsdk/javascript/Icon.cpp +++ b/fpdfsdk/javascript/cjs_icon.cpp @@ -4,11 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/javascript/Icon.h" - -#include "fpdfsdk/javascript/JS_Define.h" -#include "fpdfsdk/javascript/JS_Object.h" -#include "fpdfsdk/javascript/JS_Value.h" +#include "fpdfsdk/javascript/cjs_icon.h" const JSPropertySpec CJS_Icon::PropertySpecs[] = { {"name", get_name_static, set_name_static}, diff --git a/fpdfsdk/javascript/Icon.h b/fpdfsdk/javascript/cjs_icon.h index 9f6366178d..dd33426bf7 100644 --- a/fpdfsdk/javascript/Icon.h +++ b/fpdfsdk/javascript/cjs_icon.h @@ -4,13 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_JAVASCRIPT_ICON_H_ -#define FPDFSDK_JAVASCRIPT_ICON_H_ +#ifndef FPDFSDK_JAVASCRIPT_CJS_ICON_H_ +#define FPDFSDK_JAVASCRIPT_CJS_ICON_H_ #include "fpdfsdk/javascript/JS_Define.h" -class CPDF_Stream; - class Icon : public CJS_EmbedObj { public: explicit Icon(CJS_Object* pJSObject); @@ -41,4 +39,4 @@ class CJS_Icon : public CJS_Object { static const JSPropertySpec PropertySpecs[]; }; -#endif // FPDFSDK_JAVASCRIPT_ICON_H_ +#endif // FPDFSDK_JAVASCRIPT_CJS_ICON_H_ diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp index 9421d3dee3..177a6f43ac 100644 --- a/fpdfsdk/javascript/cjs_runtime.cpp +++ b/fpdfsdk/javascript/cjs_runtime.cpp @@ -9,7 +9,6 @@ #include <algorithm> #include "fpdfsdk/cpdfsdk_formfillenvironment.h" -#include "fpdfsdk/javascript/Icon.h" #include "fpdfsdk/javascript/JS_Define.h" #include "fpdfsdk/javascript/JS_GlobalData.h" #include "fpdfsdk/javascript/JS_Object.h" @@ -28,6 +27,7 @@ #include "fpdfsdk/javascript/cjs_globalarrays.h" #include "fpdfsdk/javascript/cjs_globalconsts.h" #include "fpdfsdk/javascript/cjs_highlight.h" +#include "fpdfsdk/javascript/cjs_icon.h" #include "fpdfsdk/javascript/cjs_position.h" #include "fpdfsdk/javascript/cjs_printparamsobj.h" #include "fpdfsdk/javascript/cjs_scalehow.h" |