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/cjs_highlight.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'fpdfsdk/javascript/cjs_highlight.cpp') diff --git a/fpdfsdk/javascript/cjs_highlight.cpp b/fpdfsdk/javascript/cjs_highlight.cpp index 6cd40dc7de..5a5f7bfad7 100644 --- a/fpdfsdk/javascript/cjs_highlight.cpp +++ b/fpdfsdk/javascript/cjs_highlight.cpp @@ -16,19 +16,9 @@ JSConstSpec CJS_Highlight::ConstSpecs[] = { const char* CJS_Highlight::g_pClassName = "highlight"; int CJS_Highlight::g_nObjDefnID = -1; -void CJS_Highlight::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() - : pEngine->NewString(ConstSpecs[i].pStr).As()); - } -} - void CJS_Highlight::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { g_nObjDefnID = pEngine->DefineObj(CJS_Highlight::g_pClassName, eObjType, nullptr, nullptr); - DefineConsts(pEngine); + DefineConsts(pEngine, g_nObjDefnID, ConstSpecs); } -- cgit v1.2.3