From ef299534cce8cc42f1bd13665a75947c88195ce0 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 26 Oct 2017 16:48:30 -0400 Subject: Cleanup statics in JS classes This CL removes the static object IDs from each of the CJS_Object subclasses and moves them to anonymous namespaces. The Spec arrays are moved to private members of the object classes. Change-Id: I5dcdb87ef57e4b374b5431580fb55cb75023f8fb Reviewed-on: https://pdfium-review.googlesource.com/16950 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- fpdfsdk/javascript/Icon.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/javascript/Icon.cpp') diff --git a/fpdfsdk/javascript/Icon.cpp b/fpdfsdk/javascript/Icon.cpp index 7a0c758d15..ffb9b81011 100644 --- a/fpdfsdk/javascript/Icon.cpp +++ b/fpdfsdk/javascript/Icon.cpp @@ -14,12 +14,18 @@ JSPropertySpec CJS_Icon::PropertySpecs[] = { {"name", get_name_static, set_name_static}, {0, 0, 0}}; -int CJS_Icon::g_nObjDefnID = -1; +int CJS_Icon::ObjDefnID = -1; +// static +int CJS_Icon::GetObjDefnID() { + return ObjDefnID; +} + +// static void CJS_Icon::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { - g_nObjDefnID = pEngine->DefineObj( + ObjDefnID = pEngine->DefineObj( "Icon", eObjType, JSConstructor, JSDestructor); - DefineProps(pEngine, g_nObjDefnID, PropertySpecs); + DefineProps(pEngine, ObjDefnID, PropertySpecs); } Icon::Icon(CJS_Object* pJSObject) -- cgit v1.2.3