diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-10-26 16:48:30 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-10-26 21:02:17 +0000 |
| commit | ef299534cce8cc42f1bd13665a75947c88195ce0 (patch) | |
| tree | 92e97b4f19dc7d8bdae7c0f43b549ad9d49bcdc4 /fpdfsdk/javascript/util.cpp | |
| parent | 15776cf22182e74d8546849780ec0cf61b96ca95 (diff) | |
| download | pdfium-ef299534cce8cc42f1bd13665a75947c88195ce0.tar.xz | |
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 <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/javascript/util.cpp')
| -rw-r--r-- | fpdfsdk/javascript/util.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/fpdfsdk/javascript/util.cpp b/fpdfsdk/javascript/util.cpp index 00d7841022..6ff9f05bca 100644 --- a/fpdfsdk/javascript/util.cpp +++ b/fpdfsdk/javascript/util.cpp @@ -28,19 +28,6 @@ #include <ctype.h> #endif -JSMethodSpec CJS_Util::MethodSpecs[] = { - {"printd", printd_static}, {"printf", printf_static}, - {"printx", printx_static}, {"scand", scand_static}, - {"byteToChar", byteToChar_static}, {0, 0}}; - -int CJS_Util::g_nObjDefnID = -1; - -void CJS_Util::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { - g_nObjDefnID = pEngine->DefineObj( - "util", eObjType, JSConstructor<CJS_Util, util>, JSDestructor<CJS_Util>); - DefineMethods(pEngine, g_nObjDefnID, MethodSpecs); -} - namespace { // Map PDF-style directives to equivalent wcsftime directives. Not @@ -71,6 +58,20 @@ const TbConvert TbConvertTable[] = { } // namespace +JSMethodSpec CJS_Util::MethodSpecs[] = { + {"printd", printd_static}, {"printf", printf_static}, + {"printx", printx_static}, {"scand", scand_static}, + {"byteToChar", byteToChar_static}, {0, 0}}; + +int CJS_Util::ObjDefnID = -1; + +// static +void CJS_Util::DefineJSObjects(CFXJS_Engine* pEngine, FXJSOBJTYPE eObjType) { + ObjDefnID = pEngine->DefineObj( + "util", eObjType, JSConstructor<CJS_Util, util>, JSDestructor<CJS_Util>); + CJS_Object::DefineMethods(pEngine, ObjDefnID, MethodSpecs); +} + util::util(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) {} util::~util() {} |