Merge to XFA: Replace second set of #defines with templates in JS_Define.h

fpdfsdk/include/jsapi/fxjs_v8.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 FXJSAPI_H
 #define FXJSAPI_H
 
 #include <v8.h>
 
 enum FXJSOBJTYPE
 {
         JS_DYNAMIC = 0,
         JS_STATIC = 1,
 };
 
 enum FXJSVALUETYPE
 {
         VT_unknown,
         VT_string,
         VT_number,
         VT_boolean,
         VT_date,
         VT_object,
         VT_fxobject,
         VT_null,
         VT_undefined
 };
 
 struct FXJSErr
 {
-        const wchar_t* message; 
-    const wchar_t* srcline;     
+        const wchar_t* message;
+    const wchar_t* srcline;
     unsigned linnum;
 };
 
 /* --------------------------------------------- API --------------------------------------------- */
 
 typedef v8::Isolate IJS_Runtime;
 class IFXJS_Context;
 class IFXJS_Runtime;
 
+typedef unsigned (*LP_CONSTRUCTOR)(IFXJS_Context* cc, v8::Handle<v8::Object> obj, v8::Handle<v8::Object> global);
+typedef unsigned (*LP_DESTRUCTOR)(v8::Handle<v8::Object> obj);
 
-#ifndef JSCRIPT_ARGS
-#define JSCRIPT_ARGS
-
-#define JS_CONSTRUCTOR_ARGS             IFXJS_Context* cc, v8::Handle<v8::Object> obj, v8::Handle<v8::Object> global
-#define JS_DESTRUCTOR_ARGS              v8::Handle<v8::Object> obj
-
-#define JS_PROPQUERY_ARGS               v8::Local<v8::String> property,const v8::PropertyCallbackInfo<v8::Integer>& info
-#define JS_NAMED_PROPGET_ARGS           v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value>& info
-
-#define JS_NAMED_PROPPUT_ARGS   v8::Local<v8::String> property,v8::Local<v8::Value> value,const v8::PropertyCallbackInfo<v8::Value>& info
-#define JS_PROPDEL_ARGS                 v8::Local<v8::String> property,const v8::PropertyCallbackInfo<v8::Boolean>& info
-
-typedef unsigned (*LP_CONSTRUCTOR)(JS_CONSTRUCTOR_ARGS);
-typedef unsigned (*LP_DESTRUCTOR)(JS_DESTRUCTOR_ARGS);
-
-#endif
 
 int                                                             JS_DefineObj(IJS_Runtime* pJSRuntime, const wchar_t* sObjName, FXJSOBJTYPE eObjType, LP_CONSTRUCTOR pConstructor, LP_DESTRUCTOR pDestructor, unsigned bApplyNew);
 int                                                             JS_DefineObjMethod(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sMethodName, v8::FunctionCallback pMethodCall, unsigned nParamNum);
 int                                                             JS_DefineObjProperty(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sPropName, v8::AccessorGetterCallback pPropGet, v8::AccessorSetterCallback pPropPut);
 int                                                             JS_DefineObjAllProperties(IJS_Runtime* pJSRuntime, int nObjDefnID, v8::NamedPropertyQueryCallback pPropQurey, v8::NamedPropertyGetterCallback pPropGet, v8::NamedPropertySetterCallback pPropPut, v8::NamedPropertyDeleterCallback pPropDel);
 int                                                             JS_DefineObjConst(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sConstName, v8::Handle<v8::Value> pDefault);
 int                                                             JS_DefineGlobalMethod(IJS_Runtime* pJSRuntime, const wchar_t* sMethodName, v8::FunctionCallback pMethodCall, unsigned nParamNum);
 int                                                             JS_DefineGlobalConst(IJS_Runtime* pJSRuntime, const wchar_t* sConstName, v8::Handle<v8::Value> pDefault);
 
 void                                                    JS_InitialRuntime(IJS_Runtime* pJSRuntime,IFXJS_Runtime* pFXRuntime, IFXJS_Context* context, v8::Persistent<v8::Context>& v8PersistentContext);
 void                                                    JS_ReleaseRuntime(IJS_Runtime* pJSRuntime, v8::Persistent<v8::Context>& v8PersistentContext);
-void                                                    JS_Initial(); 
+void                                                    JS_Initial();
 void                                                    JS_Release();
 int                                                             JS_Parse(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, const wchar_t* script, long length, FXJSErr* perror);
 int                                                             JS_Execute(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, const wchar_t* script, long length, FXJSErr* perror);
 v8::Handle<v8::Object>                  JS_NewFxDynamicObj(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, int nObjDefnID);
 v8::Handle<v8::Object>                  JS_GetStaticObj(IJS_Runtime* pJSRuntime, int nObjDefnID);
 void                                                    JS_SetThisObj(IJS_Runtime* pJSRuntime, int nThisObjID);
 v8::Handle<v8::Object>                  JS_GetThisObj(IJS_Runtime * pJSRuntime);
 int                                                             JS_GetObjDefnID(v8::Handle<v8::Object> pObj);
 IJS_Runtime*                                    JS_GetRuntime(v8::Handle<v8::Object> pObj);
 int                                                             JS_GetObjDefnID(IJS_Runtime * pJSRuntime, const wchar_t* pObjName);
@@ skipping 53 matching lines @@
 int                                                             JS_GetMinFromTime(double dt);
 int                                                             JS_GetSecFromTime(double dt);
 double                                                  JS_DateParse(const wchar_t* string);
 double                                                  JS_MakeDay(int nYear, int nMonth, int nDay);
 double                                                  JS_MakeTime(int nHour, int nMin, int nSec, int nMs);
 double                                                  JS_MakeDate(double day, double time);
 bool                                                    JS_PortIsNan(double d);
 double                                                  JS_LocalTime(double d);
 
 #endif //FXJSAPI_H