1 files changed, 8 insertions, 46 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<v8::Object> obj) {
-  CJS_Object* pObj = new CJS_PrintParamsObj(obj);
-  pObj->SetEmbedObject(new PrintParamsObj(pObj));
-  pEngine->SetObjectPrivate(obj, pObj);
-  pObj->InitInstance(static_cast<CJS_Runtime*>(pEngine));
-}
-
-void CJS_PrintParamsObj::JSDestructor(CFXJS_Engine* pEngine,
-                                      v8::Local<v8::Object> obj) {
-  delete static_cast<CJS_PrintParamsObj*>(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<CJS_PrintParamsObj, PrintParamsObj>,
+                         JSDestructor<CJS_PrintParamsObj>);
 }
 
 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<v8::Object> obj) {
-  CJS_Object* pObj = new CJS_Document(obj);
-  pObj->SetEmbedObject(new Document(pObj));
-  pEngine->SetObjectPrivate(obj, pObj);
-  pObj->InitInstance(static_cast<CJS_Runtime*>(pEngine));
-}
-
-void CJS_Document::JSDestructor(CFXJS_Engine* pEngine,
-                                v8::Local<v8::Object> obj) {
-  delete static_cast<CJS_Document*>(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<CJS_Document, Document>,
+                                    JSDestructor<CJS_Document>);
+  DefineProps(pEngine, g_nObjDefnID, PropertySpecs);
+  DefineMethods(pEngine, g_nObjDefnID, MethodSpecs);
 }
 
 void CJS_Document::InitInstance(IJS_Runtime* pIRuntime) {