summaryrefslogtreecommitdiff
path: root/fpdfsdk/javascript/app.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/app.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/app.cpp')
-rw-r--r--fpdfsdk/javascript/app.cpp51
1 files changed, 7 insertions, 44 deletions
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<v8::Object> obj) {
- CJS_Object* pObj = new CJS_TimerObj(obj);
- pObj->SetEmbedObject(new TimerObj(pObj));
- pEngine->SetObjectPrivate(obj, pObj);
- pObj->InitInstance(static_cast<CJS_Runtime*>(pEngine));
-}
-
-void CJS_TimerObj::JSDestructor(CFXJS_Engine* pEngine,
- v8::Local<v8::Object> obj) {
- delete static_cast<CJS_TimerObj*>(pEngine->GetObjectPrivate(obj));
-}
-
void CJS_TimerObj::DefineJSObjects(CFXJS_Engine* pEngine,
FXJSOBJTYPE eObjType) {
g_nObjDefnID = pEngine->DefineObj(CJS_TimerObj::g_pClassName, eObjType,
- JSConstructor, JSDestructor);
+ JSConstructor<CJS_TimerObj, TimerObj>,
+ JSDestructor<CJS_TimerObj>);
}
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<v8::Object> obj) {
- CJS_Object* pObj = new CJS_App(obj);
- pObj->SetEmbedObject(new app(pObj));
- pEngine->SetObjectPrivate(obj, pObj);
- pObj->InitInstance(static_cast<CJS_Runtime*>(pEngine));
-}
-
-void CJS_App::JSDestructor(CFXJS_Engine* pEngine, v8::Local<v8::Object> obj) {
- delete static_cast<CJS_App*>(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<CJS_App, app>, JSDestructor<CJS_App>);
+ DefineProps(pEngine, g_nObjDefnID, PropertySpecs);
+ DefineMethods(pEngine, g_nObjDefnID, MethodSpecs);
}
app::app(CJS_Object* pJSObject)