Merge to XFA: Remove unused nParamNum values from JS method tables.

fpdfsdk/include/javascript/JS_Define.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _JS_DEFINE_H_
 #define _JS_DEFINE_H_
 
 #include "../jsapi/fxjs_v8.h"
@@ skipping 14 matching lines @@
 {
         const wchar_t* pName;
         v8::AccessorGetterCallback pPropGet;
         v8::AccessorSetterCallback pPropPut;
 };
 
 struct JSMethodSpec
 {
         const wchar_t* pName;
         v8::FunctionCallback pMethodCall;
-        unsigned nParamNum;
 };
 
 /* ====================================== PUBLIC DEFINE SPEC ============================================== */
 #define JS_WIDESTRING(widestring) L###widestring
 
 #define BEGIN_JS_STATIC_CONST(js_class_name) JSConstSpec js_class_name::JS_Class_Consts[] = {
 #define JS_STATIC_CONST_ENTRY_NUMBER(const_name, pValue) {JS_WIDESTRING(const_name), pValue, L"", 0},
 #define JS_STATIC_CONST_ENTRY_STRING(const_name, pValue) {JS_WIDESTRING(const_name), 0, JS_WIDESTRING(pValue), 1},
 #define END_JS_STATIC_CONST() {0, 0, 0, 0}};
 
 #define BEGIN_JS_STATIC_PROP(js_class_name) JSPropertySpec js_class_name::JS_Class_Properties[] = {
 #define JS_STATIC_PROP_ENTRY(prop_name) {JS_WIDESTRING(prop_name), get_##prop_name##_static, set_##prop_name##_static},
 #define END_JS_STATIC_PROP() {0, 0, 0}};
 
 #define BEGIN_JS_STATIC_METHOD(js_class_name) JSMethodSpec js_class_name::JS_Class_Methods[] = {
-#define JS_STATIC_METHOD_ENTRY(method_name, nargs) {JS_WIDESTRING(method_name), method_name##_static, nargs},
-#define END_JS_STATIC_METHOD() {0, 0, 0}};
+#define JS_STATIC_METHOD_ENTRY(method_name) {JS_WIDESTRING(method_name), method_name##_static},
+#define END_JS_STATIC_METHOD() {0, 0}};
 
 /* ======================================== PROP CALLBACK ============================================ */
 
 template <class C, FX_BOOL (C::*M)(IFXJS_Context*, CJS_PropValue&, CFX_WideString&)>
 void JSPropGetter(const char* prop_name_string,
                   const char* class_name_string,
                   v8::Local<v8::String> property,
                   const v8::PropertyCallbackInfo<v8::Value>& info) {
   v8::Isolate* isolate = info.GetIsolate();
   IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)isolate->GetData(2);
@@ skipping 115 matching lines @@
 {\
         int nObjDefnID = JS_DefineObj(pRuntime, js_class_name::m_pClassName, eObjType, JSConstructor, JSDestructor, 0);\
         if (nObjDefnID >= 0)\
         {\
                 for (int j=0, szj=sizeof(JS_Class_Properties)/sizeof(JSPropertySpec)-1; j<szj; j++)\
                 {\
                         if (JS_DefineObjProperty(pRuntime, nObjDefnID, JS_Class_Properties[j].pName, JS_Class_Properties[j].pPropGet, JS_Class_Properties[j].pPropPut) < 0) return -1;\
                 }\
                 for (int k=0, szk=sizeof(JS_Class_Methods)/sizeof(JSMethodSpec)-1; k<szk; k++)\
                 {\
-                        if (JS_DefineObjMethod(pRuntime, nObjDefnID,JS_Class_Methods[k].pName, JS_Class_Methods[k].pMethodCall, JS_Class_Methods[k].nParamNum) < 0) return -1;\
+                        if (JS_DefineObjMethod(pRuntime, nObjDefnID,JS_Class_Methods[k].pName, JS_Class_Methods[k].pMethodCall) < 0) return -1;\
                 }\
                 return nObjDefnID;\
         }\
         return -1;\
 }
 
 #define IMPLEMENT_JS_CLASS(js_class_name, class_name) IMPLEMENT_JS_CLASS_RICH(js_class_name, class_name, class_name)
 
 /* ======================================== CONST CLASS ============================================ */
 
@@ skipping 151 matching lines @@
 \
         if (nObjDefnID >= 0)\
         {\
                 for (int j=0, szj=sizeof(JS_Class_Properties)/sizeof(JSPropertySpec)-1; j<szj; j++)\
                 {\
                         if (JS_DefineObjProperty(pRuntime, nObjDefnID, JS_Class_Properties[j].pName, JS_Class_Properties[j].pPropGet,JS_Class_Properties[j].pPropPut)<0)return -1;\
                 }\
 \
                 for (int k=0, szk=sizeof(JS_Class_Methods)/sizeof(JSMethodSpec)-1; k<szk; k++)\
                 {\
-                        if (JS_DefineObjMethod(pRuntime, nObjDefnID,JS_Class_Methods[k].pName,JS_Class_Methods[k].pMethodCall,JS_Class_Methods[k].nParamNum)<0)return -1;\
+                        if (JS_DefineObjMethod(pRuntime, nObjDefnID,JS_Class_Methods[k].pName,JS_Class_Methods[k].pMethodCall)<0)return -1;\
                 }\
                 if (JS_DefineObjAllProperties(pRuntime, nObjDefnID, js_class_name::queryprop_##js_class_name##_static, js_class_name::getprop_##js_class_name##_static,js_class_name::putprop_##js_class_name##_static,js_class_name::delprop_##js_class_name##_static)<0) return -1;\
 \
                 return nObjDefnID;\
         }\
 \
         return -1;\
 }
 
 /* ======================================== GLOBAL METHODS ============================================ */
@@ skipping 22 matching lines @@
     JSGlobalFunc<fun_name>(#fun_name, info); \
   }
 
 #define JS_STATIC_DECLARE_GLOBAL_FUN() \
 static JSMethodSpec     global_methods[]; \
 static int Init(IJS_Runtime* pRuntime)
 
 #define BEGIN_JS_STATIC_GLOBAL_FUN(js_class_name) \
 JSMethodSpec js_class_name::global_methods[] = {
 
-#define JS_STATIC_GLOBAL_FUN_ENTRY(method_name,nargs) JS_STATIC_METHOD_ENTRY(method_name,nargs)
+#define JS_STATIC_GLOBAL_FUN_ENTRY(method_name) JS_STATIC_METHOD_ENTRY(method_name)
 
 #define END_JS_STATIC_GLOBAL_FUN() END_JS_STATIC_METHOD()
 
 #define IMPLEMENT_JS_STATIC_GLOBAL_FUN(js_class_name) \
 int js_class_name::Init(IJS_Runtime* pRuntime)\
 {\
         for (int i=0, sz=sizeof(js_class_name::global_methods)/sizeof(JSMethodSpec)-1; i<sz; i++)\
         {\
                 if (JS_DefineGlobalMethod(pRuntime,\
                                 js_class_name::global_methods[i].pName,\
-                                js_class_name::global_methods[i].pMethodCall,\
-                                js_class_name::global_methods[i].nParamNum\
+                                js_class_name::global_methods[i].pMethodCall\
                                 ) < 0\
                         )return -1;\
         }\
         return 0;\
 }
 
 /* ======================================== GLOBAL CONSTS ============================================ */
 #define DEFINE_GLOBAL_CONST(pRuntime, const_name , const_value)\
 if (JS_DefineGlobalConst(pRuntime,JS_WIDESTRING(const_name),JS_NewString(pRuntime,JS_WIDESTRING(const_value)))) return -1
 
@@ skipping 17 matching lines @@
 #define VALUE_NAME_BOOLEAN              L"boolean"
 #define VALUE_NAME_DATE                 L"date"
 #define VALUE_NAME_OBJECT               L"object"
 #define VALUE_NAME_FXOBJ                L"fxobj"
 #define VALUE_NAME_NULL                 L"null"
 #define VALUE_NAME_UNDEFINED    L"undefined"
 
 FXJSVALUETYPE GET_VALUE_TYPE(v8::Handle<v8::Value> p);
 
 #endif //_JS_DEFINE_H_