1 files changed, 4 insertions, 22 deletions
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<v8::Object> obj) {
-  CJS_Object* pObj = new CJS_Icon(obj);
-  pObj->SetEmbedObject(new Icon(pObj));
-  pEngine->SetObjectPrivate(obj, pObj);
-  pObj->InitInstance(static_cast<CJS_Runtime*>(pEngine));
-}
-
-void CJS_Icon::JSDestructor(CFXJS_Engine* pEngine, v8::Local<v8::Object> obj) {
-  delete static_cast<CJS_Icon*>(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<CJS_Icon, Icon>, JSDestructor<CJS_Icon>);
+  DefineProps(pEngine, g_nObjDefnID, PropertySpecs);
 }
 
 Icon::Icon(CJS_Object* pJSObject)