From 909fa2daa49e5439c595e3d17a76f0e05d7934b0 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 12 Dec 2017 01:53:28 +0000 Subject: [js] Convert to using size instead of sentinels This CL changes the DefineMethod, DefineProps and DefineConsts methods to pass a size instead of depending on a sentinel value in the definition arrays. Change-Id: Ie054544124290c0833a8b21af175a203ca99591a Reviewed-on: https://pdfium-review.googlesource.com/20551 Commit-Queue: dsinclair Reviewed-by: Lei Zhang --- fxjs/cjs_app.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'fxjs/cjs_app.cpp') diff --git a/fxjs/cjs_app.cpp b/fxjs/cjs_app.cpp index e89fb2a2c7..32cac22153 100644 --- a/fxjs/cjs_app.cpp +++ b/fxjs/cjs_app.cpp @@ -48,8 +48,7 @@ const JSPropertySpec CJS_App::PropertySpecs[] = { {"viewerType", get_viewer_type_static, set_viewer_type_static}, {"viewerVariation", get_viewer_variation_static, set_viewer_variation_static}, - {"viewerVersion", get_viewer_version_static, set_viewer_version_static}, - {0, 0, 0}}; + {"viewerVersion", get_viewer_version_static, set_viewer_version_static}}; const JSMethodSpec CJS_App::MethodSpecs[] = { {"alert", alert_static}, @@ -72,8 +71,7 @@ const JSMethodSpec CJS_App::MethodSpecs[] = { {"popUpMenu", popUpMenu_static}, {"response", response_static}, {"setInterval", setInterval_static}, - {"setTimeOut", setTimeOut_static}, - {0, 0}}; + {"setTimeOut", setTimeOut_static}}; int CJS_App::ObjDefnID = -1; @@ -82,8 +80,8 @@ void CJS_App::DefineJSObjects(CFXJS_Engine* pEngine) { ObjDefnID = pEngine->DefineObj("app", FXJSOBJTYPE_STATIC, JSConstructor, JSDestructor); - DefineProps(pEngine, ObjDefnID, PropertySpecs); - DefineMethods(pEngine, ObjDefnID, MethodSpecs); + DefineProps(pEngine, ObjDefnID, PropertySpecs, FX_ArraySize(PropertySpecs)); + DefineMethods(pEngine, ObjDefnID, MethodSpecs, FX_ArraySize(MethodSpecs)); } app::app(CJS_Object* pJSObject) -- cgit v1.2.3