summaryrefslogtreecommitdiff
path: root/fpdfsdk/javascript/cjs_global.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-10-26 15:04:17 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-10-26 19:29:57 +0000
commitd808dfd5ad8c4eae1f2ea58b9b54a7d4e45a649e (patch)
tree26b829d19be342d45fa47accd4a599fb2d5aa711 /fpdfsdk/javascript/cjs_global.cpp
parent977c2a048e02dd3a9563be0c2c6ee62435e134c1 (diff)
downloadpdfium-d808dfd5ad8c4eae1f2ea58b9b54a7d4e45a649e.tar.xz
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 <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/javascript/cjs_global.cpp')
-rw-r--r--fpdfsdk/javascript/cjs_global.cpp49
1 files changed, 6 insertions, 43 deletions
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<v8::Value>()
- : pEngine->NewString(ConstSpecs[i].pStr).As<v8::Value>());
- }
-}
-
-void CJS_Global::JSConstructor(CFXJS_Engine* pEngine,
- v8::Local<v8::Object> obj) {
- CJS_Object* pObj = new CJS_Global(obj);
- pObj->SetEmbedObject(new JSGlobalAlternate(pObj));
- pEngine->SetObjectPrivate(obj, pObj);
- pObj->InitInstance(static_cast<CJS_Runtime*>(pEngine));
-}
-
-void CJS_Global::JSDestructor(CFXJS_Engine* pEngine,
- v8::Local<v8::Object> obj) {
- delete static_cast<CJS_Global*>(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<v8::String> property,
const v8::PropertyCallbackInfo<v8::Integer>& 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<CJS_Global, JSGlobalAlternate>, JSDestructor<CJS_Global>);
+ DefineConsts(pEngine, g_nObjDefnID, ConstSpecs);
+ DefineProps(pEngine, g_nObjDefnID, PropertySpecs);
+ DefineMethods(pEngine, g_nObjDefnID, MethodSpecs);
DefineAllProperties(pEngine);
}