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/color.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/javascript/color.h') diff --git a/fpdfsdk/javascript/color.h b/fpdfsdk/javascript/color.h index 0a97de0621..49dec3c5e8 100644 --- a/fpdfsdk/javascript/color.h +++ b/fpdfsdk/javascript/color.h @@ -85,15 +85,11 @@ class color : public CJS_EmbedObj { class CJS_Color : public CJS_Object { public: + static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); + explicit CJS_Color(v8::Local pObject) : CJS_Object(pObject) {} ~CJS_Color() override {} - static int g_nObjDefnID; - static JSPropertySpec PropertySpecs[]; - static JSMethodSpec MethodSpecs[]; - - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); - JS_STATIC_PROP(black, black, color); JS_STATIC_PROP(blue, blue, color); JS_STATIC_PROP(cyan, cyan, color); @@ -109,6 +105,11 @@ class CJS_Color : public CJS_Object { JS_STATIC_METHOD(convert, color); JS_STATIC_METHOD(equal, color); + + private: + static int ObjDefnID; + static JSPropertySpec PropertySpecs[]; + static JSMethodSpec MethodSpecs[]; }; #endif // FPDFSDK_JAVASCRIPT_COLOR_H_ -- cgit v1.2.3