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/cjs_global.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'fpdfsdk/javascript/cjs_global.h') diff --git a/fpdfsdk/javascript/cjs_global.h b/fpdfsdk/javascript/cjs_global.h index e5eb3aab4b..499a66b7c2 100644 --- a/fpdfsdk/javascript/cjs_global.h +++ b/fpdfsdk/javascript/cjs_global.h @@ -11,17 +11,6 @@ class CJS_Global : public CJS_Object { public: - explicit CJS_Global(v8::Local pObject) : CJS_Object(pObject) {} - ~CJS_Global() override {} - - // CJS_Object - void InitInstance(IJS_Runtime* pIRuntime) override; - - static int g_nObjDefnID; - static JSConstSpec ConstSpecs[]; - static JSPropertySpec PropertySpecs[]; - static JSMethodSpec MethodSpecs[]; - static void DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType); static void DefineAllProperties(CFXJS_Engine* pEngine); @@ -38,6 +27,16 @@ class CJS_Global : public CJS_Object { static void setPersistent_static( const v8::FunctionCallbackInfo& info); + + explicit CJS_Global(v8::Local pObject) : CJS_Object(pObject) {} + ~CJS_Global() override {} + + // CJS_Object + void InitInstance(IJS_Runtime* pIRuntime) override; + + private: + static int ObjDefnID; + static JSMethodSpec MethodSpecs[]; }; #endif // FPDFSDK_JAVASCRIPT_CJS_GLOBAL_H_ -- cgit v1.2.3