From d808dfd5ad8c4eae1f2ea58b9b54a7d4e45a649e Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 26 Oct 2017 15:04:17 -0400 Subject: Cleanup JS define methods This CL moves DefineProps, DefineMethods and DefineConsts to the CJS_Object and removes from the subclasses. The JSConstructor and JSDestructor are moved to be templated static methods in JS_Defines. Change-Id: Ibe5ee063a32ae2332b8affc843d97ee6da21f4ee Reviewed-on: https://pdfium-review.googlesource.com/16930 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- fpdfsdk/javascript/Document.cpp | 54 ++++++------------------------------ fpdfsdk/javascript/Document.h | 8 ------ fpdfsdk/javascript/Field.cpp | 34 +++-------------------- fpdfsdk/javascript/Field.h | 5 ---- fpdfsdk/javascript/Icon.cpp | 26 +++-------------- fpdfsdk/javascript/Icon.h | 4 --- fpdfsdk/javascript/JS_Define.h | 31 ++++++++------------- fpdfsdk/javascript/JS_Object.cpp | 32 ++++++++++++++++++++- fpdfsdk/javascript/JS_Object.h | 30 ++++++++++++++++++++ fpdfsdk/javascript/app.cpp | 51 +++++----------------------------- fpdfsdk/javascript/app.h | 8 ------ fpdfsdk/javascript/cjs_annot.cpp | 25 ++--------------- fpdfsdk/javascript/cjs_annot.h | 4 --- fpdfsdk/javascript/cjs_border.cpp | 12 +------- fpdfsdk/javascript/cjs_border.h | 5 ++-- fpdfsdk/javascript/cjs_display.cpp | 12 +------- fpdfsdk/javascript/cjs_display.h | 5 ++-- fpdfsdk/javascript/cjs_font.cpp | 12 +------- fpdfsdk/javascript/cjs_font.h | 5 ++-- fpdfsdk/javascript/cjs_global.cpp | 49 ++++---------------------------- fpdfsdk/javascript/cjs_global.h | 12 ++------ fpdfsdk/javascript/cjs_highlight.cpp | 12 +------- fpdfsdk/javascript/cjs_highlight.h | 5 ++-- fpdfsdk/javascript/cjs_position.cpp | 12 +------- fpdfsdk/javascript/cjs_position.h | 5 ++-- fpdfsdk/javascript/cjs_scalehow.cpp | 12 +------- fpdfsdk/javascript/cjs_scalehow.h | 4 +-- fpdfsdk/javascript/cjs_scalewhen.cpp | 12 +------- fpdfsdk/javascript/cjs_scalewhen.h | 4 +-- fpdfsdk/javascript/cjs_style.cpp | 12 +------- fpdfsdk/javascript/cjs_style.h | 5 ++-- fpdfsdk/javascript/cjs_zoomtype.cpp | 12 +------- fpdfsdk/javascript/cjs_zoomtype.h | 5 ++-- fpdfsdk/javascript/color.cpp | 34 +++-------------------- fpdfsdk/javascript/color.h | 5 ---- fpdfsdk/javascript/console.cpp | 25 ++--------------- fpdfsdk/javascript/console.h | 4 --- fpdfsdk/javascript/event.cpp | 25 ++--------------- fpdfsdk/javascript/event.h | 4 --- fpdfsdk/javascript/report.cpp | 25 ++--------------- fpdfsdk/javascript/report.h | 4 --- fpdfsdk/javascript/util.cpp | 25 +++-------------- fpdfsdk/javascript/util.h | 4 --- 43 files changed, 152 insertions(+), 527 deletions(-) diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp index a5724e8f76..8175b0d246 100644 --- a/fpdfsdk/javascript/Document.cpp +++ b/fpdfsdk/javascript/Document.cpp @@ -41,23 +41,12 @@ const char* CJS_PrintParamsObj::g_pClassName = "PrintParamsObj"; int CJS_PrintParamsObj::g_nObjDefnID = -1; -void CJS_PrintParamsObj::JSConstructor(CFXJS_Engine* pEngine, - v8::Local obj) { - CJS_Object* pObj = new CJS_PrintParamsObj(obj); - pObj->SetEmbedObject(new PrintParamsObj(pObj)); - pEngine->SetObjectPrivate(obj, pObj); - pObj->InitInstance(static_cast(pEngine)); -} - -void CJS_PrintParamsObj::JSDestructor(CFXJS_Engine* pEngine, - v8::Local obj) { - delete static_cast(pEngine->GetObjectPrivate(obj)); -} - void CJS_PrintParamsObj::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { - g_nObjDefnID = pEngine->DefineObj(CJS_PrintParamsObj::g_pClassName, eObjType, - JSConstructor, JSDestructor); + g_nObjDefnID = + pEngine->DefineObj(CJS_PrintParamsObj::g_pClassName, eObjType, + JSConstructor, + JSDestructor); } PrintParamsObj::PrintParamsObj(CJS_Object* pJSObject) @@ -160,40 +149,13 @@ JSMethodSpec CJS_Document::MethodSpecs[] = { const char* CJS_Document::g_pClassName = "Document"; int CJS_Document::g_nObjDefnID = -1; -void CJS_Document::JSConstructor(CFXJS_Engine* pEngine, - v8::Local obj) { - CJS_Object* pObj = new CJS_Document(obj); - pObj->SetEmbedObject(new Document(pObj)); - pEngine->SetObjectPrivate(obj, pObj); - pObj->InitInstance(static_cast(pEngine)); -} - -void CJS_Document::JSDestructor(CFXJS_Engine* pEngine, - v8::Local obj) { - delete static_cast(pEngine->GetObjectPrivate(obj)); -} - -void CJS_Document::DefineProps(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(PropertySpecs) - 1; ++i) { - pEngine->DefineObjProperty(g_nObjDefnID, PropertySpecs[i].pName, - PropertySpecs[i].pPropGet, - PropertySpecs[i].pPropPut); - } -} - -void CJS_Document::DefineMethods(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(MethodSpecs) - 1; ++i) { - pEngine->DefineObjMethod(g_nObjDefnID, MethodSpecs[i].pName, - MethodSpecs[i].pMethodCall); - } -} - void CJS_Document::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Document::g_pClassName, eObjType, - JSConstructor, JSDestructor); - DefineProps(pEngine); - DefineMethods(pEngine); + JSConstructor, + JSDestructor); + DefineProps(pEngine, g_nObjDefnID, PropertySpecs); + DefineMethods(pEngine, g_nObjDefnID, MethodSpecs); } void CJS_Document::InitInstance(IJS_Runtime* pIRuntime) { diff --git a/fpdfsdk/javascript/Document.h b/fpdfsdk/javascript/Document.h index 6ec916ca14..308678f6b3 100644 --- a/fpdfsdk/javascript/Document.h +++ b/fpdfsdk/javascript/Document.h @@ -41,9 +41,6 @@ class CJS_PrintParamsObj : public CJS_Object { static const char* g_pClassName; static int g_nObjDefnID; - static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj); - static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj); - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); }; @@ -280,12 +277,7 @@ class CJS_Document : public CJS_Object { static JSPropertySpec PropertySpecs[]; static JSMethodSpec MethodSpecs[]; - static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj); - static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj); - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static void DefineProps(CFXJS_Engine* pEngine); - static void DefineMethods(CFXJS_Engine* pEngine); JS_STATIC_PROP(ADBE, ADBE, Document); JS_STATIC_PROP(author, author, Document); diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp index 34c0c7a89e..288a24d084 100644 --- a/fpdfsdk/javascript/Field.cpp +++ b/fpdfsdk/javascript/Field.cpp @@ -168,38 +168,12 @@ JSMethodSpec CJS_Field::MethodSpecs[] = { const char* CJS_Field::g_pClassName = "Field"; int CJS_Field::g_nObjDefnID = -1; -void CJS_Field::JSConstructor(CFXJS_Engine* pEngine, - v8::Local obj) { - CJS_Object* pObj = new CJS_Field(obj); - pObj->SetEmbedObject(new Field(pObj)); - pEngine->SetObjectPrivate(obj, pObj); - pObj->InitInstance(static_cast(pEngine)); -} - -void CJS_Field::JSDestructor(CFXJS_Engine* pEngine, v8::Local obj) { - delete static_cast(pEngine->GetObjectPrivate(obj)); -} - -void CJS_Field::DefineProps(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(PropertySpecs) - 1; ++i) { - pEngine->DefineObjProperty(g_nObjDefnID, PropertySpecs[i].pName, - PropertySpecs[i].pPropGet, - PropertySpecs[i].pPropPut); - } -} - -void CJS_Field::DefineMethods(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(MethodSpecs) - 1; ++i) { - pEngine->DefineObjMethod(g_nObjDefnID, MethodSpecs[i].pName, - MethodSpecs[i].pMethodCall); - } -} - void CJS_Field::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Field::g_pClassName, eObjType, - JSConstructor, JSDestructor); - DefineProps(pEngine); - DefineMethods(pEngine); + JSConstructor, + JSDestructor); + DefineProps(pEngine, g_nObjDefnID, PropertySpecs); + DefineMethods(pEngine, g_nObjDefnID, MethodSpecs); } CJS_DelayData::CJS_DelayData(FIELD_PROP prop, int idx, const WideString& name) diff --git a/fpdfsdk/javascript/Field.h b/fpdfsdk/javascript/Field.h index cd43b601d9..5427a69130 100644 --- a/fpdfsdk/javascript/Field.h +++ b/fpdfsdk/javascript/Field.h @@ -369,12 +369,7 @@ class CJS_Field : public CJS_Object { static JSPropertySpec PropertySpecs[]; static JSMethodSpec MethodSpecs[]; - static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj); - static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj); - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static void DefineProps(CFXJS_Engine* pEngine); - static void DefineMethods(CFXJS_Engine* pEngine); JS_STATIC_PROP(alignment, alignment, Field); JS_STATIC_PROP(borderStyle, border_style, Field); diff --git a/fpdfsdk/javascript/Icon.cpp b/fpdfsdk/javascript/Icon.cpp index d64878bcc9..ab37e13198 100644 --- a/fpdfsdk/javascript/Icon.cpp +++ b/fpdfsdk/javascript/Icon.cpp @@ -17,29 +17,11 @@ JSPropertySpec CJS_Icon::PropertySpecs[] = { const char* CJS_Icon::g_pClassName = "Icon"; int CJS_Icon::g_nObjDefnID = -1; -void CJS_Icon::JSConstructor(CFXJS_Engine* pEngine, v8::Local obj) { - CJS_Object* pObj = new CJS_Icon(obj); - pObj->SetEmbedObject(new Icon(pObj)); - pEngine->SetObjectPrivate(obj, pObj); - pObj->InitInstance(static_cast(pEngine)); -} - -void CJS_Icon::JSDestructor(CFXJS_Engine* pEngine, v8::Local obj) { - delete static_cast(pEngine->GetObjectPrivate(obj)); -} - -void CJS_Icon::DefineProps(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(PropertySpecs) - 1; ++i) { - pEngine->DefineObjProperty(g_nObjDefnID, PropertySpecs[i].pName, - PropertySpecs[i].pPropGet, - PropertySpecs[i].pPropPut); - } -} - void CJS_Icon::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { - g_nObjDefnID = pEngine->DefineObj(CJS_Icon::g_pClassName, eObjType, - JSConstructor, JSDestructor); - DefineProps(pEngine); + g_nObjDefnID = + pEngine->DefineObj(CJS_Icon::g_pClassName, eObjType, + JSConstructor, JSDestructor); + DefineProps(pEngine, g_nObjDefnID, PropertySpecs); } Icon::Icon(CJS_Object* pJSObject) diff --git a/fpdfsdk/javascript/Icon.h b/fpdfsdk/javascript/Icon.h index 8f2c8fc411..2d5ad8c7a0 100644 --- a/fpdfsdk/javascript/Icon.h +++ b/fpdfsdk/javascript/Icon.h @@ -35,11 +35,7 @@ class CJS_Icon : public CJS_Object { static int g_nObjDefnID; static JSPropertySpec PropertySpecs[]; - static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj); - static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj); - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static void DefineProps(CFXJS_Engine* pEngine); JS_STATIC_PROP(name, name, Icon); }; diff --git a/fpdfsdk/javascript/JS_Define.h b/fpdfsdk/javascript/JS_Define.h index 7d089aa4b8..e0535fa6fc 100644 --- a/fpdfsdk/javascript/JS_Define.h +++ b/fpdfsdk/javascript/JS_Define.h @@ -21,25 +21,18 @@ // Rich JS classes provide constants, methods, properties, and the ability // to construct native object state. -struct JSConstSpec { - enum Type { Number = 0, String = 1 }; - - const char* pName; - Type eType; - double number; - const char* pStr; -}; - -struct JSPropertySpec { - const char* pName; - v8::AccessorGetterCallback pPropGet; - v8::AccessorSetterCallback pPropPut; -}; - -struct JSMethodSpec { - const char* pName; - v8::FunctionCallback pMethodCall; -}; +template +static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj) { + CJS_Object* pObj = new T(obj); + pObj->SetEmbedObject(new A(pObj)); + pEngine->SetObjectPrivate(obj, pObj); + pObj->InitInstance(static_cast(pEngine)); +} + +template +static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj) { + delete static_cast(pEngine->GetObjectPrivate(obj)); +} template void JSPropGetter(const char* prop_name_string, diff --git a/fpdfsdk/javascript/JS_Object.cpp b/fpdfsdk/javascript/JS_Object.cpp index 01a4641b2e..b6e63b540b 100644 --- a/fpdfsdk/javascript/JS_Object.cpp +++ b/fpdfsdk/javascript/JS_Object.cpp @@ -11,7 +11,37 @@ CJS_EmbedObj::CJS_EmbedObj(CJS_Object* pJSObject) : m_pJSObject(pJSObject) {} -CJS_EmbedObj::~CJS_EmbedObj() { +CJS_EmbedObj::~CJS_EmbedObj() {} + +// static +void CJS_Object::DefineConsts(CFXJS_Engine* pEngine, + int objId, + const JSConstSpec consts[]) { + for (size_t i = 0; consts[i].pName != 0; ++i) { + pEngine->DefineObjConst( + objId, consts[i].pName, + consts[i].eType == JSConstSpec::Number + ? pEngine->NewNumber(consts[i].number).As() + : pEngine->NewString(consts[i].pStr).As()); + } +} + +// static +void CJS_Object::DefineProps(CFXJS_Engine* pEngine, + int objId, + const JSPropertySpec props[]) { + for (size_t i = 0; props[i].pName != 0; ++i) { + pEngine->DefineObjProperty(objId, props[i].pName, props[i].pPropGet, + props[i].pPropPut); + } +} + +// static +void CJS_Object::DefineMethods(CFXJS_Engine* pEngine, + int objId, + const JSMethodSpec methods[]) { + for (size_t i = 0; methods[i].pName != 0; ++i) + pEngine->DefineObjMethod(objId, methods[i].pName, methods[i].pMethodCall); } CJS_Object::CJS_Object(v8::Local pObject) { diff --git a/fpdfsdk/javascript/JS_Object.h b/fpdfsdk/javascript/JS_Object.h index e0a96a97cf..20d5203397 100644 --- a/fpdfsdk/javascript/JS_Object.h +++ b/fpdfsdk/javascript/JS_Object.h @@ -18,6 +18,26 @@ class CJS_EventContext; class CJS_Object; class CPDFSDK_FormFillEnvironment; +struct JSConstSpec { + enum Type { Number = 0, String = 1 }; + + const char* pName; + Type eType; + double number; + const char* pStr; +}; + +struct JSPropertySpec { + const char* pName; + v8::AccessorGetterCallback pPropGet; + v8::AccessorSetterCallback pPropPut; +}; + +struct JSMethodSpec { + const char* pName; + v8::FunctionCallback pMethodCall; +}; + class CJS_EmbedObj { public: explicit CJS_EmbedObj(CJS_Object* pJSObject); @@ -31,6 +51,16 @@ class CJS_EmbedObj { class CJS_Object { public: + static void DefineConsts(CFXJS_Engine* pEngine, + int objId, + const JSConstSpec consts[]); + static void DefineProps(CFXJS_Engine* pEngine, + int objId, + const JSPropertySpec props[]); + static void DefineMethods(CFXJS_Engine* pEngine, + int objId, + const JSMethodSpec methods[]); + explicit CJS_Object(v8::Local pObject); virtual ~CJS_Object(); diff --git a/fpdfsdk/javascript/app.cpp b/fpdfsdk/javascript/app.cpp index 84bca4a26d..0b331a8b1b 100644 --- a/fpdfsdk/javascript/app.cpp +++ b/fpdfsdk/javascript/app.cpp @@ -145,23 +145,11 @@ GlobalTimer::TimerMap* GlobalTimer::GetGlobalTimerMap() { const char* CJS_TimerObj::g_pClassName = "TimerObj"; int CJS_TimerObj::g_nObjDefnID = -1; -void CJS_TimerObj::JSConstructor(CFXJS_Engine* pEngine, - v8::Local obj) { - CJS_Object* pObj = new CJS_TimerObj(obj); - pObj->SetEmbedObject(new TimerObj(pObj)); - pEngine->SetObjectPrivate(obj, pObj); - pObj->InitInstance(static_cast(pEngine)); -} - -void CJS_TimerObj::JSDestructor(CFXJS_Engine* pEngine, - v8::Local obj) { - delete static_cast(pEngine->GetObjectPrivate(obj)); -} - void CJS_TimerObj::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_TimerObj::g_pClassName, eObjType, - JSConstructor, JSDestructor); + JSConstructor, + JSDestructor); } TimerObj::TimerObj(CJS_Object* pJSObject) @@ -226,37 +214,12 @@ JSMethodSpec CJS_App::MethodSpecs[] = {{"alert", alert_static}, const char* CJS_App::g_pClassName = "app"; int CJS_App::g_nObjDefnID = -1; -void CJS_App::JSConstructor(CFXJS_Engine* pEngine, v8::Local obj) { - CJS_Object* pObj = new CJS_App(obj); - pObj->SetEmbedObject(new app(pObj)); - pEngine->SetObjectPrivate(obj, pObj); - pObj->InitInstance(static_cast(pEngine)); -} - -void CJS_App::JSDestructor(CFXJS_Engine* pEngine, v8::Local obj) { - delete static_cast(pEngine->GetObjectPrivate(obj)); -} - -void CJS_App::DefineProps(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(PropertySpecs) - 1; ++i) { - pEngine->DefineObjProperty(g_nObjDefnID, PropertySpecs[i].pName, - PropertySpecs[i].pPropGet, - PropertySpecs[i].pPropPut); - } -} - -void CJS_App::DefineMethods(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(MethodSpecs) - 1; ++i) { - pEngine->DefineObjMethod(g_nObjDefnID, MethodSpecs[i].pName, - MethodSpecs[i].pMethodCall); - } -} - void CJS_App::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { - g_nObjDefnID = pEngine->DefineObj(CJS_App::g_pClassName, eObjType, - JSConstructor, JSDestructor); - DefineProps(pEngine); - DefineMethods(pEngine); + g_nObjDefnID = + pEngine->DefineObj(CJS_App::g_pClassName, eObjType, + JSConstructor, JSDestructor); + DefineProps(pEngine, g_nObjDefnID, PropertySpecs); + DefineMethods(pEngine, g_nObjDefnID, MethodSpecs); } app::app(CJS_Object* pJSObject) diff --git a/fpdfsdk/javascript/app.h b/fpdfsdk/javascript/app.h index 36d2a84bdd..454bb42500 100644 --- a/fpdfsdk/javascript/app.h +++ b/fpdfsdk/javascript/app.h @@ -36,9 +36,6 @@ class CJS_TimerObj : public CJS_Object { static const char* g_pClassName; static int g_nObjDefnID; - static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj); - static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj); - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); }; @@ -154,12 +151,7 @@ class CJS_App : public CJS_Object { static JSPropertySpec PropertySpecs[]; static JSMethodSpec MethodSpecs[]; - static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj); - static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj); - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static void DefineProps(CFXJS_Engine* pEngine); - static void DefineMethods(CFXJS_Engine* pEngine); JS_STATIC_PROP(activeDocs, active_docs, app); JS_STATIC_PROP(calculate, calculate, app); diff --git a/fpdfsdk/javascript/cjs_annot.cpp b/fpdfsdk/javascript/cjs_annot.cpp index 8847642d13..9f528a3839 100644 --- a/fpdfsdk/javascript/cjs_annot.cpp +++ b/fpdfsdk/javascript/cjs_annot.cpp @@ -28,30 +28,11 @@ JSPropertySpec CJS_Annot::PropertySpecs[] = { const char* CJS_Annot::g_pClassName = "Annot"; int CJS_Annot::g_nObjDefnID = -1; -void CJS_Annot::JSConstructor(CFXJS_Engine* pEngine, - v8::Local obj) { - CJS_Object* pObj = new CJS_Annot(obj); - pObj->SetEmbedObject(new Annot(pObj)); - pEngine->SetObjectPrivate(obj, pObj); - pObj->InitInstance(static_cast(pEngine)); -} - -void CJS_Annot::JSDestructor(CFXJS_Engine* pEngine, v8::Local obj) { - delete static_cast(pEngine->GetObjectPrivate(obj)); -} - -void CJS_Annot::DefineProps(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(PropertySpecs) - 1; ++i) { - pEngine->DefineObjProperty(g_nObjDefnID, PropertySpecs[i].pName, - PropertySpecs[i].pPropGet, - PropertySpecs[i].pPropPut); - } -} - void CJS_Annot::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Annot::g_pClassName, eObjType, - JSConstructor, JSDestructor); - DefineProps(pEngine); + JSConstructor, + JSDestructor); + DefineProps(pEngine, g_nObjDefnID, PropertySpecs); } Annot::Annot(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) {} diff --git a/fpdfsdk/javascript/cjs_annot.h b/fpdfsdk/javascript/cjs_annot.h index 086392c225..a16e510205 100644 --- a/fpdfsdk/javascript/cjs_annot.h +++ b/fpdfsdk/javascript/cjs_annot.h @@ -39,11 +39,7 @@ class CJS_Annot : public CJS_Object { static int g_nObjDefnID; static JSPropertySpec PropertySpecs[]; - static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj); - static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj); - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static void DefineProps(CFXJS_Engine* pEngine); JS_STATIC_PROP(hidden, hidden, Annot); JS_STATIC_PROP(name, name, Annot); diff --git a/fpdfsdk/javascript/cjs_border.cpp b/fpdfsdk/javascript/cjs_border.cpp index 50e69b26a5..6bb2e09cdd 100644 --- a/fpdfsdk/javascript/cjs_border.cpp +++ b/fpdfsdk/javascript/cjs_border.cpp @@ -17,18 +17,8 @@ JSConstSpec CJS_Border::ConstSpecs[] = { const char* CJS_Border::g_pClassName = "border"; int CJS_Border::g_nObjDefnID = -1; -void CJS_Border::DefineConsts(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(ConstSpecs) - 1; ++i) { - pEngine->DefineObjConst( - g_nObjDefnID, ConstSpecs[i].pName, - ConstSpecs[i].eType == JSConstSpec::Number - ? pEngine->NewNumber(ConstSpecs[i].number).As() - : pEngine->NewString(ConstSpecs[i].pStr).As()); - } -} - void CJS_Border::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Border::g_pClassName, eObjType, nullptr, nullptr); - DefineConsts(pEngine); + DefineConsts(pEngine, g_nObjDefnID, ConstSpecs); } diff --git a/fpdfsdk/javascript/cjs_border.h b/fpdfsdk/javascript/cjs_border.h index c3ce247e4c..26a710a625 100644 --- a/fpdfsdk/javascript/cjs_border.h +++ b/fpdfsdk/javascript/cjs_border.h @@ -16,10 +16,9 @@ class CJS_Border : public CJS_Object { static const char* g_pClassName; static int g_nObjDefnID; - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static JSConstSpec ConstSpecs[]; - static void DefineConsts(CFXJS_Engine* pEngine); + + static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); }; #endif // FPDFSDK_JAVASCRIPT_CJS_BORDER_H_ diff --git a/fpdfsdk/javascript/cjs_display.cpp b/fpdfsdk/javascript/cjs_display.cpp index df05ed2671..5d604b55e1 100644 --- a/fpdfsdk/javascript/cjs_display.cpp +++ b/fpdfsdk/javascript/cjs_display.cpp @@ -15,18 +15,8 @@ JSConstSpec CJS_Display::ConstSpecs[] = {{"visible", JSConstSpec::Number, 0, 0}, const char* CJS_Display::g_pClassName = "display"; int CJS_Display::g_nObjDefnID = -1; -void CJS_Display::DefineConsts(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(ConstSpecs) - 1; ++i) { - pEngine->DefineObjConst( - g_nObjDefnID, ConstSpecs[i].pName, - ConstSpecs[i].eType == JSConstSpec::Number - ? pEngine->NewNumber(ConstSpecs[i].number).As() - : pEngine->NewString(ConstSpecs[i].pStr).As()); - } -} - void CJS_Display::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Display::g_pClassName, eObjType, nullptr, nullptr); - DefineConsts(pEngine); + DefineConsts(pEngine, g_nObjDefnID, ConstSpecs); } diff --git a/fpdfsdk/javascript/cjs_display.h b/fpdfsdk/javascript/cjs_display.h index f92eb86ec7..61e741dba2 100644 --- a/fpdfsdk/javascript/cjs_display.h +++ b/fpdfsdk/javascript/cjs_display.h @@ -16,10 +16,9 @@ class CJS_Display : public CJS_Object { static const char* g_pClassName; static int g_nObjDefnID; - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static JSConstSpec ConstSpecs[]; - static void DefineConsts(CFXJS_Engine* pEngine); + + static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); }; #endif // FPDFSDK_JAVASCRIPT_CJS_DISPLAY_H_ diff --git a/fpdfsdk/javascript/cjs_font.cpp b/fpdfsdk/javascript/cjs_font.cpp index 799702c922..0a9f02f2f1 100644 --- a/fpdfsdk/javascript/cjs_font.cpp +++ b/fpdfsdk/javascript/cjs_font.cpp @@ -26,18 +26,8 @@ JSConstSpec CJS_Font::ConstSpecs[] = { const char* CJS_Font::g_pClassName = "font"; int CJS_Font::g_nObjDefnID = -1; -void CJS_Font::DefineConsts(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(ConstSpecs) - 1; ++i) { - pEngine->DefineObjConst( - g_nObjDefnID, ConstSpecs[i].pName, - ConstSpecs[i].eType == JSConstSpec::Number - ? pEngine->NewNumber(ConstSpecs[i].number).As() - : pEngine->NewString(ConstSpecs[i].pStr).As()); - } -} - void CJS_Font::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Font::g_pClassName, eObjType, nullptr, nullptr); - DefineConsts(pEngine); + DefineConsts(pEngine, g_nObjDefnID, ConstSpecs); } diff --git a/fpdfsdk/javascript/cjs_font.h b/fpdfsdk/javascript/cjs_font.h index d45a578868..7881cdf2e6 100644 --- a/fpdfsdk/javascript/cjs_font.h +++ b/fpdfsdk/javascript/cjs_font.h @@ -16,10 +16,9 @@ class CJS_Font : public CJS_Object { static const char* g_pClassName; static int g_nObjDefnID; - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static JSConstSpec ConstSpecs[]; - static void DefineConsts(CFXJS_Engine* pEngine); + + static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); }; #endif // FPDFSDK_JAVASCRIPT_CJS_FONT_H_ diff --git a/fpdfsdk/javascript/cjs_global.cpp b/fpdfsdk/javascript/cjs_global.cpp index d81fe04464..1ec9bbf9ea 100644 --- a/fpdfsdk/javascript/cjs_global.cpp +++ b/fpdfsdk/javascript/cjs_global.cpp @@ -199,44 +199,6 @@ void CJS_Global::InitInstance(IJS_Runtime* pIRuntime) { pGlobal->Initial(pRuntime->GetFormFillEnv()); } -void CJS_Global::DefineConsts(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(ConstSpecs) - 1; ++i) { - pEngine->DefineObjConst( - g_nObjDefnID, ConstSpecs[i].pName, - ConstSpecs[i].eType == JSConstSpec::Number - ? pEngine->NewNumber(ConstSpecs[i].number).As() - : pEngine->NewString(ConstSpecs[i].pStr).As()); - } -} - -void CJS_Global::JSConstructor(CFXJS_Engine* pEngine, - v8::Local obj) { - CJS_Object* pObj = new CJS_Global(obj); - pObj->SetEmbedObject(new JSGlobalAlternate(pObj)); - pEngine->SetObjectPrivate(obj, pObj); - pObj->InitInstance(static_cast(pEngine)); -} - -void CJS_Global::JSDestructor(CFXJS_Engine* pEngine, - v8::Local obj) { - delete static_cast(pEngine->GetObjectPrivate(obj)); -} - -void CJS_Global::DefineProps(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(PropertySpecs) - 1; ++i) { - pEngine->DefineObjProperty(g_nObjDefnID, PropertySpecs[i].pName, - PropertySpecs[i].pPropGet, - PropertySpecs[i].pPropPut); - } -} - -void CJS_Global::DefineMethods(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(MethodSpecs) - 1; ++i) { - pEngine->DefineObjMethod(g_nObjDefnID, MethodSpecs[i].pName, - MethodSpecs[i].pMethodCall); - } -} - void CJS_Global::queryprop_static( v8::Local property, const v8::PropertyCallbackInfo& info) { @@ -269,11 +231,12 @@ void CJS_Global::DefineAllProperties(CFXJS_Engine* pEngine) { } void CJS_Global::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { - g_nObjDefnID = pEngine->DefineObj(CJS_Global::g_pClassName, eObjType, - JSConstructor, JSDestructor); - DefineConsts(pEngine); - DefineProps(pEngine); - DefineMethods(pEngine); + g_nObjDefnID = pEngine->DefineObj( + CJS_Global::g_pClassName, eObjType, + JSConstructor, JSDestructor); + DefineConsts(pEngine, g_nObjDefnID, ConstSpecs); + DefineProps(pEngine, g_nObjDefnID, PropertySpecs); + DefineMethods(pEngine, g_nObjDefnID, MethodSpecs); DefineAllProperties(pEngine); } diff --git a/fpdfsdk/javascript/cjs_global.h b/fpdfsdk/javascript/cjs_global.h index 96788f7727..8174418eea 100644 --- a/fpdfsdk/javascript/cjs_global.h +++ b/fpdfsdk/javascript/cjs_global.h @@ -19,18 +19,13 @@ class CJS_Global : public CJS_Object { static const char* g_pClassName; static int g_nObjDefnID; - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static JSConstSpec ConstSpecs[]; - static void DefineConsts(CFXJS_Engine* pEngine); - - static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj); - static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj); - static void DefineProps(CFXJS_Engine* pEngine); - static void DefineMethods(CFXJS_Engine* pEngine); static JSPropertySpec PropertySpecs[]; static JSMethodSpec MethodSpecs[]; + static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); + static void DefineAllProperties(CFXJS_Engine* pEngine); + static void queryprop_static( v8::Local property, const v8::PropertyCallbackInfo& info); @@ -41,7 +36,6 @@ class CJS_Global : public CJS_Object { const v8::PropertyCallbackInfo& info); static void delprop_static(v8::Local property, const v8::PropertyCallbackInfo& info); - static void DefineAllProperties(CFXJS_Engine* pEngine); static void setPersistent_static( const v8::FunctionCallbackInfo& info); diff --git a/fpdfsdk/javascript/cjs_highlight.cpp b/fpdfsdk/javascript/cjs_highlight.cpp index 6cd40dc7de..5a5f7bfad7 100644 --- a/fpdfsdk/javascript/cjs_highlight.cpp +++ b/fpdfsdk/javascript/cjs_highlight.cpp @@ -16,19 +16,9 @@ JSConstSpec CJS_Highlight::ConstSpecs[] = { const char* CJS_Highlight::g_pClassName = "highlight"; int CJS_Highlight::g_nObjDefnID = -1; -void CJS_Highlight::DefineConsts(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(ConstSpecs) - 1; ++i) { - pEngine->DefineObjConst( - g_nObjDefnID, ConstSpecs[i].pName, - ConstSpecs[i].eType == JSConstSpec::Number - ? pEngine->NewNumber(ConstSpecs[i].number).As() - : pEngine->NewString(ConstSpecs[i].pStr).As()); - } -} - void CJS_Highlight::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Highlight::g_pClassName, eObjType, nullptr, nullptr); - DefineConsts(pEngine); + DefineConsts(pEngine, g_nObjDefnID, ConstSpecs); } diff --git a/fpdfsdk/javascript/cjs_highlight.h b/fpdfsdk/javascript/cjs_highlight.h index 0ac645de37..dd16e0cb60 100644 --- a/fpdfsdk/javascript/cjs_highlight.h +++ b/fpdfsdk/javascript/cjs_highlight.h @@ -16,10 +16,9 @@ class CJS_Highlight : public CJS_Object { static const char* g_pClassName; static int g_nObjDefnID; - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static JSConstSpec ConstSpecs[]; - static void DefineConsts(CFXJS_Engine* pEngine); + + static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); }; #endif // FPDFSDK_JAVASCRIPT_CJS_HIGHLIGHT_H_ diff --git a/fpdfsdk/javascript/cjs_position.cpp b/fpdfsdk/javascript/cjs_position.cpp index 5c33546896..46b908b589 100644 --- a/fpdfsdk/javascript/cjs_position.cpp +++ b/fpdfsdk/javascript/cjs_position.cpp @@ -19,19 +19,9 @@ JSConstSpec CJS_Position::ConstSpecs[] = { const char* CJS_Position::g_pClassName = "position"; int CJS_Position::g_nObjDefnID = -1; -void CJS_Position::DefineConsts(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(ConstSpecs) - 1; ++i) { - pEngine->DefineObjConst( - g_nObjDefnID, ConstSpecs[i].pName, - ConstSpecs[i].eType == JSConstSpec::Number - ? pEngine->NewNumber(ConstSpecs[i].number).As() - : pEngine->NewString(ConstSpecs[i].pStr).As()); - } -} - void CJS_Position::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Position::g_pClassName, eObjType, nullptr, nullptr); - DefineConsts(pEngine); + DefineConsts(pEngine, g_nObjDefnID, ConstSpecs); } diff --git a/fpdfsdk/javascript/cjs_position.h b/fpdfsdk/javascript/cjs_position.h index 54d12c574f..f180af480d 100644 --- a/fpdfsdk/javascript/cjs_position.h +++ b/fpdfsdk/javascript/cjs_position.h @@ -16,10 +16,9 @@ class CJS_Position : public CJS_Object { static const char* g_pClassName; static int g_nObjDefnID; - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static JSConstSpec ConstSpecs[]; - static void DefineConsts(CFXJS_Engine* pEngine); + + static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); }; #endif // FPDFSDK_JAVASCRIPT_CJS_POSITION_H_ diff --git a/fpdfsdk/javascript/cjs_scalehow.cpp b/fpdfsdk/javascript/cjs_scalehow.cpp index 25160bad9b..d593d83434 100644 --- a/fpdfsdk/javascript/cjs_scalehow.cpp +++ b/fpdfsdk/javascript/cjs_scalehow.cpp @@ -14,19 +14,9 @@ JSConstSpec CJS_ScaleHow::ConstSpecs[] = { const char* CJS_ScaleHow::g_pClassName = "scaleHow"; int CJS_ScaleHow::g_nObjDefnID = -1; -void CJS_ScaleHow::DefineConsts(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(ConstSpecs) - 1; ++i) { - pEngine->DefineObjConst( - g_nObjDefnID, ConstSpecs[i].pName, - ConstSpecs[i].eType == JSConstSpec::Number - ? pEngine->NewNumber(ConstSpecs[i].number).As() - : pEngine->NewString(ConstSpecs[i].pStr).As()); - } -} - void CJS_ScaleHow::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_ScaleHow::g_pClassName, eObjType, nullptr, nullptr); - DefineConsts(pEngine); + DefineConsts(pEngine, g_nObjDefnID, ConstSpecs); } diff --git a/fpdfsdk/javascript/cjs_scalehow.h b/fpdfsdk/javascript/cjs_scalehow.h index c742398e97..2d3906eced 100644 --- a/fpdfsdk/javascript/cjs_scalehow.h +++ b/fpdfsdk/javascript/cjs_scalehow.h @@ -16,10 +16,10 @@ class CJS_ScaleHow : public CJS_Object { static const char* g_pClassName; static int g_nObjDefnID; + static JSConstSpec ConstSpecs[]; + static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static JSConstSpec ConstSpecs[]; - static void DefineConsts(CFXJS_Engine* pEngine); }; #endif // FPDFSDK_JAVASCRIPT_CJS_SCALEHOW_H_ diff --git a/fpdfsdk/javascript/cjs_scalewhen.cpp b/fpdfsdk/javascript/cjs_scalewhen.cpp index 22c678410c..129a150a3a 100644 --- a/fpdfsdk/javascript/cjs_scalewhen.cpp +++ b/fpdfsdk/javascript/cjs_scalewhen.cpp @@ -16,19 +16,9 @@ JSConstSpec CJS_ScaleWhen::ConstSpecs[] = { const char* CJS_ScaleWhen::g_pClassName = "scaleWhen"; int CJS_ScaleWhen::g_nObjDefnID = -1; -void CJS_ScaleWhen::DefineConsts(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(ConstSpecs) - 1; ++i) { - pEngine->DefineObjConst( - g_nObjDefnID, ConstSpecs[i].pName, - ConstSpecs[i].eType == JSConstSpec::Number - ? pEngine->NewNumber(ConstSpecs[i].number).As() - : pEngine->NewString(ConstSpecs[i].pStr).As()); - } -} - void CJS_ScaleWhen::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_ScaleWhen::g_pClassName, eObjType, nullptr, nullptr); - DefineConsts(pEngine); + DefineConsts(pEngine, g_nObjDefnID, ConstSpecs); } diff --git a/fpdfsdk/javascript/cjs_scalewhen.h b/fpdfsdk/javascript/cjs_scalewhen.h index d7727e9512..72e8de1cb9 100644 --- a/fpdfsdk/javascript/cjs_scalewhen.h +++ b/fpdfsdk/javascript/cjs_scalewhen.h @@ -16,10 +16,10 @@ class CJS_ScaleWhen : public CJS_Object { static const char* g_pClassName; static int g_nObjDefnID; + static JSConstSpec ConstSpecs[]; + static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static JSConstSpec ConstSpecs[]; - static void DefineConsts(CFXJS_Engine* pEngine); }; #endif // FPDFSDK_JAVASCRIPT_CJS_SCALEWHEN_H_ diff --git a/fpdfsdk/javascript/cjs_style.cpp b/fpdfsdk/javascript/cjs_style.cpp index 872851fb7c..57064133a5 100644 --- a/fpdfsdk/javascript/cjs_style.cpp +++ b/fpdfsdk/javascript/cjs_style.cpp @@ -18,18 +18,8 @@ JSConstSpec CJS_Style::ConstSpecs[] = { const char* CJS_Style::g_pClassName = "style"; int CJS_Style::g_nObjDefnID = -1; -void CJS_Style::DefineConsts(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(ConstSpecs) - 1; ++i) { - pEngine->DefineObjConst( - g_nObjDefnID, ConstSpecs[i].pName, - ConstSpecs[i].eType == JSConstSpec::Number - ? pEngine->NewNumber(ConstSpecs[i].number).As() - : pEngine->NewString(ConstSpecs[i].pStr).As()); - } -} - void CJS_Style::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Style::g_pClassName, eObjType, nullptr, nullptr); - DefineConsts(pEngine); + DefineConsts(pEngine, g_nObjDefnID, ConstSpecs); } diff --git a/fpdfsdk/javascript/cjs_style.h b/fpdfsdk/javascript/cjs_style.h index 0c98f5031a..2609f3e5a8 100644 --- a/fpdfsdk/javascript/cjs_style.h +++ b/fpdfsdk/javascript/cjs_style.h @@ -16,10 +16,9 @@ class CJS_Style : public CJS_Object { static const char* g_pClassName; static int g_nObjDefnID; - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static JSConstSpec ConstSpecs[]; - static void DefineConsts(CFXJS_Engine* pEngine); + + static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); }; #endif // FPDFSDK_JAVASCRIPT_CJS_STYLE_H_ diff --git a/fpdfsdk/javascript/cjs_zoomtype.cpp b/fpdfsdk/javascript/cjs_zoomtype.cpp index fb5e2ab466..88707765eb 100644 --- a/fpdfsdk/javascript/cjs_zoomtype.cpp +++ b/fpdfsdk/javascript/cjs_zoomtype.cpp @@ -19,19 +19,9 @@ JSConstSpec CJS_Zoomtype::ConstSpecs[] = { const char* CJS_Zoomtype::g_pClassName = "zoomtype"; int CJS_Zoomtype::g_nObjDefnID = -1; -void CJS_Zoomtype::DefineConsts(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(ConstSpecs) - 1; ++i) { - pEngine->DefineObjConst( - g_nObjDefnID, ConstSpecs[i].pName, - ConstSpecs[i].eType == JSConstSpec::Number - ? pEngine->NewNumber(ConstSpecs[i].number).As() - : pEngine->NewString(ConstSpecs[i].pStr).As()); - } -} - void CJS_Zoomtype::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Zoomtype::g_pClassName, eObjType, nullptr, nullptr); - DefineConsts(pEngine); + DefineConsts(pEngine, g_nObjDefnID, ConstSpecs); } diff --git a/fpdfsdk/javascript/cjs_zoomtype.h b/fpdfsdk/javascript/cjs_zoomtype.h index b204d5874b..e7dd7da53a 100644 --- a/fpdfsdk/javascript/cjs_zoomtype.h +++ b/fpdfsdk/javascript/cjs_zoomtype.h @@ -16,10 +16,9 @@ class CJS_Zoomtype : public CJS_Object { static const char* g_pClassName; static int g_nObjDefnID; - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static JSConstSpec ConstSpecs[]; - static void DefineConsts(CFXJS_Engine* pEngine); + + static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); }; #endif // FPDFSDK_JAVASCRIPT_CJS_ZOOMTYPE_H_ diff --git a/fpdfsdk/javascript/color.cpp b/fpdfsdk/javascript/color.cpp index 25008b4452..0e05ddff2d 100644 --- a/fpdfsdk/javascript/color.cpp +++ b/fpdfsdk/javascript/color.cpp @@ -37,38 +37,12 @@ JSMethodSpec CJS_Color::MethodSpecs[] = {{"convert", convert_static}, const char* CJS_Color::g_pClassName = "color"; int CJS_Color::g_nObjDefnID = -1; -void CJS_Color::JSConstructor(CFXJS_Engine* pEngine, - v8::Local obj) { - CJS_Object* pObj = new CJS_Color(obj); - pObj->SetEmbedObject(new color(pObj)); - pEngine->SetObjectPrivate(obj, pObj); - pObj->InitInstance(static_cast(pEngine)); -} - -void CJS_Color::JSDestructor(CFXJS_Engine* pEngine, v8::Local obj) { - delete static_cast(pEngine->GetObjectPrivate(obj)); -} - -void CJS_Color::DefineProps(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(PropertySpecs) - 1; ++i) { - pEngine->DefineObjProperty(g_nObjDefnID, PropertySpecs[i].pName, - PropertySpecs[i].pPropGet, - PropertySpecs[i].pPropPut); - } -} - -void CJS_Color::DefineMethods(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(MethodSpecs) - 1; ++i) { - pEngine->DefineObjMethod(g_nObjDefnID, MethodSpecs[i].pName, - MethodSpecs[i].pMethodCall); - } -} - void CJS_Color::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Color::g_pClassName, eObjType, - JSConstructor, JSDestructor); - DefineProps(pEngine); - DefineMethods(pEngine); + JSConstructor, + JSDestructor); + DefineProps(pEngine, g_nObjDefnID, PropertySpecs); + DefineMethods(pEngine, g_nObjDefnID, MethodSpecs); } // static diff --git a/fpdfsdk/javascript/color.h b/fpdfsdk/javascript/color.h index dd5ca412c0..5705787d43 100644 --- a/fpdfsdk/javascript/color.h +++ b/fpdfsdk/javascript/color.h @@ -93,12 +93,7 @@ class CJS_Color : public CJS_Object { static JSPropertySpec PropertySpecs[]; static JSMethodSpec MethodSpecs[]; - static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj); - static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj); - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static void DefineProps(CFXJS_Engine* pEngine); - static void DefineMethods(CFXJS_Engine* pEngine); JS_STATIC_PROP(black, black, color); JS_STATIC_PROP(blue, blue, color); diff --git a/fpdfsdk/javascript/console.cpp b/fpdfsdk/javascript/console.cpp index eb566b0756..dbe8e328d1 100644 --- a/fpdfsdk/javascript/console.cpp +++ b/fpdfsdk/javascript/console.cpp @@ -23,30 +23,11 @@ JSMethodSpec CJS_Console::MethodSpecs[] = {{"clear", clear_static}, const char* CJS_Console::g_pClassName = "console"; int CJS_Console::g_nObjDefnID = -1; -void CJS_Console::JSConstructor(CFXJS_Engine* pEngine, - v8::Local obj) { - CJS_Object* pObj = new CJS_Console(obj); - pObj->SetEmbedObject(new console(pObj)); - pEngine->SetObjectPrivate(obj, pObj); - pObj->InitInstance(static_cast(pEngine)); -} - -void CJS_Console::JSDestructor(CFXJS_Engine* pEngine, - v8::Local obj) { - delete static_cast(pEngine->GetObjectPrivate(obj)); -} - -void CJS_Console::DefineMethods(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(MethodSpecs) - 1; ++i) { - pEngine->DefineObjMethod(g_nObjDefnID, MethodSpecs[i].pName, - MethodSpecs[i].pMethodCall); - } -} - void CJS_Console::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Console::g_pClassName, eObjType, - JSConstructor, JSDestructor); - DefineMethods(pEngine); + JSConstructor, + JSDestructor); + DefineMethods(pEngine, g_nObjDefnID, MethodSpecs); } console::console(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) {} diff --git a/fpdfsdk/javascript/console.h b/fpdfsdk/javascript/console.h index 1d85765648..ca0c144f76 100644 --- a/fpdfsdk/javascript/console.h +++ b/fpdfsdk/javascript/console.h @@ -36,11 +36,7 @@ class CJS_Console : public CJS_Object { static int g_nObjDefnID; static JSMethodSpec MethodSpecs[]; - static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj); - static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj); - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static void DefineMethods(CFXJS_Engine* pEngine); JS_STATIC_METHOD(clear, console); JS_STATIC_METHOD(hide, console); diff --git a/fpdfsdk/javascript/event.cpp b/fpdfsdk/javascript/event.cpp index f20ac40374..61aa546195 100644 --- a/fpdfsdk/javascript/event.cpp +++ b/fpdfsdk/javascript/event.cpp @@ -39,30 +39,11 @@ JSPropertySpec CJS_Event::PropertySpecs[] = { const char* CJS_Event::g_pClassName = "event"; int CJS_Event::g_nObjDefnID = -1; -void CJS_Event::JSConstructor(CFXJS_Engine* pEngine, - v8::Local obj) { - CJS_Object* pObj = new CJS_Event(obj); - pObj->SetEmbedObject(new event(pObj)); - pEngine->SetObjectPrivate(obj, pObj); - pObj->InitInstance(static_cast(pEngine)); -} - -void CJS_Event::JSDestructor(CFXJS_Engine* pEngine, v8::Local obj) { - delete static_cast(pEngine->GetObjectPrivate(obj)); -} - -void CJS_Event::DefineProps(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(PropertySpecs) - 1; ++i) { - pEngine->DefineObjProperty(g_nObjDefnID, PropertySpecs[i].pName, - PropertySpecs[i].pPropGet, - PropertySpecs[i].pPropPut); - } -} - void CJS_Event::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Event::g_pClassName, eObjType, - JSConstructor, JSDestructor); - DefineProps(pEngine); + JSConstructor, + JSDestructor); + DefineProps(pEngine, g_nObjDefnID, PropertySpecs); } event::event(CJS_Object* pJsObject) : CJS_EmbedObj(pJsObject) {} diff --git a/fpdfsdk/javascript/event.h b/fpdfsdk/javascript/event.h index 4d03f45edd..69745633f1 100644 --- a/fpdfsdk/javascript/event.h +++ b/fpdfsdk/javascript/event.h @@ -84,11 +84,7 @@ class CJS_Event : public CJS_Object { static int g_nObjDefnID; static JSPropertySpec PropertySpecs[]; - static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj); - static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj); - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static void DefineProps(CFXJS_Engine* pEngine); JS_STATIC_PROP(change, change, event); JS_STATIC_PROP(changeEx, change_ex, event); diff --git a/fpdfsdk/javascript/report.cpp b/fpdfsdk/javascript/report.cpp index 7652ce4fb2..eec611896d 100644 --- a/fpdfsdk/javascript/report.cpp +++ b/fpdfsdk/javascript/report.cpp @@ -19,30 +19,11 @@ JSMethodSpec CJS_Report::MethodSpecs[] = {{"save", save_static}, const char* CJS_Report::g_pClassName = "Report"; int CJS_Report::g_nObjDefnID = -1; -void CJS_Report::JSConstructor(CFXJS_Engine* pEngine, - v8::Local obj) { - CJS_Object* pObj = new CJS_Report(obj); - pObj->SetEmbedObject(new Report(pObj)); - pEngine->SetObjectPrivate(obj, pObj); - pObj->InitInstance(static_cast(pEngine)); -} - -void CJS_Report::JSDestructor(CFXJS_Engine* pEngine, - v8::Local obj) { - delete static_cast(pEngine->GetObjectPrivate(obj)); -} - -void CJS_Report::DefineMethods(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(MethodSpecs) - 1; ++i) { - pEngine->DefineObjMethod(g_nObjDefnID, MethodSpecs[i].pName, - MethodSpecs[i].pMethodCall); - } -} - void CJS_Report::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Report::g_pClassName, eObjType, - JSConstructor, JSDestructor); - DefineMethods(pEngine); + JSConstructor, + JSDestructor); + DefineMethods(pEngine, g_nObjDefnID, MethodSpecs); } Report::Report(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) {} diff --git a/fpdfsdk/javascript/report.h b/fpdfsdk/javascript/report.h index d6fe4e7f61..13a6718297 100644 --- a/fpdfsdk/javascript/report.h +++ b/fpdfsdk/javascript/report.h @@ -32,11 +32,7 @@ class CJS_Report : public CJS_Object { static int g_nObjDefnID; static JSMethodSpec MethodSpecs[]; - static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj); - static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj); - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static void DefineMethods(CFXJS_Engine* pEngine); JS_STATIC_METHOD(save, Report) JS_STATIC_METHOD(writeText, Report); diff --git a/fpdfsdk/javascript/util.cpp b/fpdfsdk/javascript/util.cpp index 08846c18b1..75b0db3141 100644 --- a/fpdfsdk/javascript/util.cpp +++ b/fpdfsdk/javascript/util.cpp @@ -36,28 +36,11 @@ JSMethodSpec CJS_Util::MethodSpecs[] = { const char* CJS_Util::g_pClassName = "util"; int CJS_Util::g_nObjDefnID = -1; -void CJS_Util::JSConstructor(CFXJS_Engine* pEngine, v8::Local obj) { - CJS_Object* pObj = new CJS_Util(obj); - pObj->SetEmbedObject(new util(pObj)); - pEngine->SetObjectPrivate(obj, pObj); - pObj->InitInstance(static_cast(pEngine)); -} - -void CJS_Util::JSDestructor(CFXJS_Engine* pEngine, v8::Local obj) { - delete static_cast(pEngine->GetObjectPrivate(obj)); -} - -void CJS_Util::DefineMethods(CFXJS_Engine* pEngine) { - for (size_t i = 0; i < FX_ArraySize(MethodSpecs) - 1; ++i) { - pEngine->DefineObjMethod(g_nObjDefnID, MethodSpecs[i].pName, - MethodSpecs[i].pMethodCall); - } -} - void CJS_Util::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { - g_nObjDefnID = pEngine->DefineObj(CJS_Util::g_pClassName, eObjType, - JSConstructor, JSDestructor); - DefineMethods(pEngine); + g_nObjDefnID = + pEngine->DefineObj(CJS_Util::g_pClassName, eObjType, + JSConstructor, JSDestructor); + DefineMethods(pEngine, g_nObjDefnID, MethodSpecs); } namespace { diff --git a/fpdfsdk/javascript/util.h b/fpdfsdk/javascript/util.h index 8903eb9c95..c3ede9a8ac 100644 --- a/fpdfsdk/javascript/util.h +++ b/fpdfsdk/javascript/util.h @@ -51,11 +51,7 @@ class CJS_Util : public CJS_Object { static int g_nObjDefnID; static JSMethodSpec MethodSpecs[]; - static void JSConstructor(CFXJS_Engine* pEngine, v8::Local obj); - static void JSDestructor(CFXJS_Engine* pEngine, v8::Local obj); - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - static void DefineMethods(CFXJS_Engine* pEngine); JS_STATIC_METHOD(printd, util); JS_STATIC_METHOD(printf, util); -- cgit v1.2.3