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/Icon.cpp | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'fpdfsdk/javascript/Icon.cpp') 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) -- cgit v1.2.3