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_document.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'fxjs/cjs_document.cpp') diff --git a/fxjs/cjs_document.cpp b/fxjs/cjs_document.cpp index 46ece171b0..d4eca2f175 100644 --- a/fxjs/cjs_document.cpp +++ b/fxjs/cjs_document.cpp @@ -61,8 +61,7 @@ const JSPropertySpec CJS_Document::PropertySpecs[] = { {"title", get_title_static, set_title_static}, {"URL", get_URL_static, set_URL_static}, {"zoom", get_zoom_static, set_zoom_static}, - {"zoomType", get_zoom_type_static, set_zoom_type_static}, - {0, 0, 0}}; + {"zoomType", get_zoom_type_static, set_zoom_type_static}}; const JSMethodSpec CJS_Document::MethodSpecs[] = { {"addAnnot", addAnnot_static}, @@ -106,8 +105,7 @@ const JSMethodSpec CJS_Document::MethodSpecs[] = { {"saveAs", saveAs_static}, {"submitForm", submitForm_static}, {"syncAnnotScan", syncAnnotScan_static}, - {"mailDoc", mailDoc_static}, - {0, 0}}; + {"mailDoc", mailDoc_static}}; int CJS_Document::ObjDefnID = -1; @@ -121,8 +119,8 @@ void CJS_Document::DefineJSObjects(CFXJS_Engine* pEngine) { ObjDefnID = pEngine->DefineObj("Document", FXJSOBJTYPE_GLOBAL, JSConstructor, JSDestructor); - DefineProps(pEngine, ObjDefnID, PropertySpecs); - DefineMethods(pEngine, ObjDefnID, MethodSpecs); + DefineProps(pEngine, ObjDefnID, PropertySpecs, FX_ArraySize(PropertySpecs)); + DefineMethods(pEngine, ObjDefnID, MethodSpecs, FX_ArraySize(MethodSpecs)); } void CJS_Document::InitInstance(IJS_Runtime* pIRuntime) { -- cgit v1.2.3