Merge to XFA: Replace ugly JS_Define macros with templates.

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_
 
 typedef v8::Value                       JSValue;
 typedef v8::Handle<v8::Object>  JSObject;
 typedef v8::Handle<v8::Object>  JSFXObject;
 typedef unsigned                JSBool;
 
+#include "JS_Object.h"
+#include "JS_Value.h"
+
 struct JSConstSpec
 {
         const wchar_t* pName;
         double number;
         const wchar_t* string;
         FX_BYTE t; //0:double 1:str
 };
 
 struct JSPropertySpec
 {
@@ skipping 26 matching lines @@
 #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 MEMLEAKCHECK_1() ((void)0)
-#define MEMLEAKCHECK_2(main_name, sub_name) ((void)0)
-
-
-/*
-#ifdef _DEBUG
-#define MEMLEAKCHECK_1() \
-        _CrtMemState state1;\
-        _CrtMemCheckpoint(&state1);
-
-#define MEMLEAKCHECK_2(main_name,sub_name) \
-        _CrtMemState state2;\
-        _CrtMemCheckpoint(&state2);\
-        _CrtMemState diff;\
-        _CrtMemDifference(&diff,&state1,&state2);\
-        if (diff.lSizes[_NORMAL_BLOCK] > 0)\
-        {\
-                TRACE("Detected normal block memory leaks in JS Module! [%s.%s]\n",#main_name,#sub_name);\
-                _CrtMemDumpStatistics(&diff);\
-        }
-#else
-        #define MEMLEAKCHECK_1() ((void)0)
-        #define MEMLEAKCHECK_2(main_name,sub_name) ((void)0)
-#endif
-*/
 
 /* ======================================== PROP CALLBACK ============================================ */
 
-#define JS_STATIC_PROP_GET(prop_name, class_name)\
-  static void get_##prop_name##_static(v8::Local<v8::String> property, \
-                                       const v8::PropertyCallbackInfo<v8::Value>& info) \
-{\
-        v8::Isolate* isolate = info.GetIsolate();\
-        v8::Local<v8::Context> context = isolate->GetCurrentContext();\
-        IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)isolate->GetData(2);\
-        if (pRuntime == NULL) return;\
-        IFXJS_Context* cc = pRuntime->GetCurrentContext();\
-        CJS_PropValue value(isolate);\
-        value.StartGetting();\
-        CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());\
-        ASSERT(pJSObj != NULL);\
-        class_name* pObj = (class_name*)pJSObj->GetEmbedObject();\
-        ASSERT(pObj != NULL);\
-        JS_ErrorString sError;\
-        FX_BOOL bRet = FALSE;\
-        MEMLEAKCHECK_1();\
-        bRet = pObj->prop_name(cc, value, sError);\
-        MEMLEAKCHECK_2(class_name, prop_name);\
-        if (bRet)\
-        {\
-                info.GetReturnValue().Set((v8::Handle<v8::Value>)value);\
-                return ;\
-        }\
-        else\
-        {\
-        CFX_ByteString cbName;\
-                cbName.Format("%s.%s", #class_name, #prop_name);\
-                JS_Error(NULL,CFX_WideString::FromLocal(cbName), sError);\
-                return ;\
-        }\
+template <class C, FX_BOOL (C::*M)(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError)>
+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();
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+  IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)isolate->GetData(2);
+  IFXJS_Context* pContext = pRuntime->GetCurrentContext();

[brucedawson, 2015/02/18 22:23:34]

The distinction between context and pContext is non-obvious when examining uses
of the variables. Maybe give them names that reflect their sources:
isolateContext and runtimeContext?

[Tom Sepez, 2015/02/18 23:26:48]

It turns out that isolateContext, as you call it, is unused, and it doesn't look
like having a v8::local holding it for the duration provides any benefit
(searching around chromium code, other places all do something with the
context).  So I deleted this line, as it was giving compilation warnings galore

+  CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());
+  C* pObj = reinterpret_cast<C*>(pJSObj->GetEmbedObject());
+  JS_ErrorString sError;
+  CJS_PropValue value(isolate);

[brucedawson, 2015/02/18 22:23:34]

Why are these two lines (value declaration and first usage) moved below
JS_GetPrivate? It makes verifying the behavior is unchanged more difficult.

[Tom Sepez, 2015/02/18 23:26:48]

Ok, I'll put it back the other way.  The order in which they create these seemed
awkward in that things were being made earlier than they needed to be.

+  value.StartGetting();
+  if (!(pObj->*M)(pContext, value, sError)) {
+    CFX_ByteString cbName;
+    cbName.Format("%s.%s", class_name_string, prop_name_string);
+    JS_Error(NULL, CFX_WideString::FromLocal(cbName), sError);
+    return;
+  }
+  info.GetReturnValue().Set((v8::Handle<v8::Value>)value);
 }
 
-#define JS_STATIC_PROP_SET(prop_name, class_name)\
-  static void set_##prop_name##_static(v8::Local<v8::String> property, \
-                                       v8::Local<v8::Value> value, \
-                                       const v8::PropertyCallbackInfo<void>& info) \
-{\
-        v8::Isolate* isolate = info.GetIsolate();\
-        v8::Local<v8::Context> context = isolate->GetCurrentContext();\
-        IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)isolate->GetData(2);\
-        if (pRuntime == NULL) return;\
-        IFXJS_Context* cc = pRuntime->GetCurrentContext();\
-        CJS_PropValue propValue(CJS_Value(isolate,value,VT_unknown));\
-        propValue.StartSetting();\
-        CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());\
-        ASSERT(pJSObj != NULL);\
-        class_name* pObj = (class_name*)pJSObj->GetEmbedObject();\
-        ASSERT(pObj != NULL);\
-        JS_ErrorString sError;\
-        FX_BOOL bRet = FALSE;\
-        MEMLEAKCHECK_1();\
-        bRet = pObj->prop_name(cc, propValue, sError);\
-        MEMLEAKCHECK_2(class_name, prop_name);\
-        if (bRet)\
-        {\
-                return ;\
-        }\
-        else\
-        {\
-                CFX_ByteString cbName;\
-                cbName.Format("%s.%s", #class_name, #prop_name);\
-                JS_Error(NULL,CFX_WideString::FromLocal(cbName), sError);\
-                return ;\
-        }\
+template <class C, FX_BOOL (C::*M)(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError)>
+void JSPropSetter(const char* prop_name_string,
+                  const char* class_name_string,
+                  v8::Local<v8::String> property,
+                  v8::Local<v8::Value> value,
+                  const v8::PropertyCallbackInfo<void>& info) {
+  v8::Isolate* isolate = info.GetIsolate();
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+  IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)isolate->GetData(2);
+  IFXJS_Context* pContext = pRuntime->GetCurrentContext();

[brucedawson, 2015/02/18 22:23:34]

The comments from above about context/pContext and moving the value declaration
and first usage apply here also.

[Tom Sepez, 2015/02/18 23:26:49]

Done.

+  CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());
+  C* pObj = reinterpret_cast<C*>(pJSObj->GetEmbedObject());
+  JS_ErrorString sError;
+  CJS_PropValue propValue(CJS_Value(isolate, value, VT_unknown));
+  propValue.StartSetting();
+  if (!(pObj->*M)(pContext, propValue, sError)) {
+    CFX_ByteString cbName;
+    cbName.Format("%s.%s", class_name_string, prop_name_string);
+    JS_Error(NULL, CFX_WideString::FromLocal(cbName), sError);
+  }
 }
 
-#define JS_STATIC_PROP(prop_name, class_name)\
-JS_STATIC_PROP_GET(prop_name, class_name);\
-JS_STATIC_PROP_SET(prop_name, class_name)
+#define JS_STATIC_PROP(prop_name, class_name) \
+  static void get_##prop_name##_static( \
+      v8::Local<v8::String> property, \
+      const v8::PropertyCallbackInfo<v8::Value>& info) { \
+    JSPropGetter<class_name, &class_name::prop_name>( \
+        #prop_name, #class_name, property, info); \
+  } \
+  static void set_##prop_name##_static( \
+      v8::Local<v8::String> property, \
+      v8::Local<v8::Value> value, \
+      const v8::PropertyCallbackInfo<void>& info) { \
+    JSPropSetter<class_name, &class_name::prop_name>( \
+        #prop_name, #class_name, property, value, info); \
+  }
 
 /* ========================================= METHOD CALLBACK =========================================== */
 
-#define JS_STATIC_METHOD(method_name, class_name)\
-  static void method_name##_static(const v8::FunctionCallbackInfo<v8::Value>& info) \
-{\
-        v8::Isolate* isolate = info.GetIsolate();\
-        v8::Local<v8::Context> context = isolate->GetCurrentContext();\
-        IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)isolate->GetData(2);\
-        if (pRuntime == NULL) return;\
-        IFXJS_Context* cc = pRuntime->GetCurrentContext();\
-        CJS_Parameters parameters;\
-        for (unsigned int i = 0; i<(unsigned int)info.Length(); i++)\
-    {\
-                parameters.push_back(CJS_Value(isolate, info[i], VT_unknown));\
-        }\
-        CJS_Value valueRes(isolate);\
-        CJS_Object* pJSObj = (CJS_Object *)JS_GetPrivate(isolate,info.Holder());\
-        ASSERT(pJSObj != NULL);\
-        class_name* pObj = (class_name*)pJSObj->GetEmbedObject();\
-        ASSERT(pObj != NULL);\
-        JS_ErrorString sError;\
-        FX_BOOL bRet = FALSE;\
-        MEMLEAKCHECK_1();\
-        bRet = pObj->method_name(cc, parameters, valueRes, sError);\
-        MEMLEAKCHECK_2(class_name, method_name);\
-        if (bRet)\
-        {\
-                info.GetReturnValue().Set(valueRes.ToJSValue());\
-                return ;\
-        }\
-        else\
-        {\
-                CFX_ByteString cbName;\
-                cbName.Format("%s.%s", #class_name, #method_name);\
-                JS_Error(NULL, CFX_WideString::FromLocal(cbName), sError);\
-                return ;\
-        }\
+template <class C, FX_BOOL (C::*M)(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)>
+void JSMethod(const char* method_name_string,
+              const char* class_name_string,
+              const v8::FunctionCallbackInfo<v8::Value>& info) {
+  v8::Isolate* isolate = info.GetIsolate();
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+  IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)isolate->GetData(2);
+  IFXJS_Context* cc = pRuntime->GetCurrentContext();

[brucedawson, 2015/02/18 22:23:34]

Should use the same name for this context variable as above.

[Tom Sepez, 2015/02/18 23:26:48]

Done.

+  CJS_Parameters parameters;
+  for (unsigned int i = 0; i<(unsigned int)info.Length(); i++) {
+    parameters.push_back(CJS_Value(isolate, info[i], VT_unknown));
+  }
+  CJS_Value valueRes(isolate);
+  CJS_Object* pJSObj = (CJS_Object *)JS_GetPrivate(isolate,info.Holder());
+  C* pObj = reinterpret_cast<C*>(pJSObj->GetEmbedObject());
+  JS_ErrorString sError;
+  if (!(pObj->*M)(cc, parameters, valueRes, sError)) {
+    CFX_ByteString cbName;
+    cbName.Format("%s.%s", class_name_string, method_name_string);
+    JS_Error(NULL, CFX_WideString::FromLocal(cbName), sError);
+    return;
+  }
+  info.GetReturnValue().Set(valueRes.ToJSValue());
 }
 
+#define JS_STATIC_METHOD(method_name, class_name) \
+  static void method_name##_static( \
+      const v8::FunctionCallbackInfo<v8::Value>& info) {    \
+    JSMethod<class_name, &class_name::method_name>( \
+        #class_name, #method_name, info); \
+  }
+
+#define JS_SPECIAL_STATIC_METHOD(method_name, class_alternate, class_name) \
+  static void method_name##_static( \
+      const v8::FunctionCallbackInfo<v8::Value>& info) {    \
+    JSMethod<class_alternate, &class_alternate::method_name>( \
+        #class_name, #method_name, info); \
+  }
+
 /* ===================================== JS CLASS =============================================== */
 
 #define DECLARE_JS_CLASS(js_class_name) \
         static JSBool JSConstructor(IFXJS_Context* cc, JSFXObject obj,JSFXObject global);\
         static JSBool JSDestructor(JSFXObject obj);\
         static int Init(IJS_Runtime* pRuntime, FXJSOBJTYPE eObjType);\
         static void GetConsts(JSConstSpec*& pConsts, int& nSize);\
         static void GetProperties(JSPropertySpec*& pProperties, int& nSize);\
         static void GetMethods(JSMethodSpec*& pMethods, int& nSize);\
         static JSConstSpec JS_Class_Consts[];\
@@ skipping 115 matching lines @@
         void js_class_name::queryprop_##js_class_name##_static(JS_PROPQUERY_ARGS)\
 {\
         v8::Isolate* isolate = info.GetIsolate();\
         v8::String::Utf8Value utf8_value(property);\
         CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());\
         CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());\
         ASSERT(pJSObj != NULL);\
         class_alternate* pObj = (class_alternate*)pJSObj->GetEmbedObject();\
         ASSERT(pObj != NULL);\
         FX_BOOL bRet = FALSE;\
-        MEMLEAKCHECK_1();\
         bRet = pObj->QueryProperty(propname.c_str());\
-        MEMLEAKCHECK_2(class_name, prop_name.c_str());\
         if (bRet)\
         {\
                 info.GetReturnValue().Set(0x004);\
                 return ;\
         }\
         else\
         {\
                 info.GetReturnValue().Set(0);\
                 return ;\
         }\
         return ;\
 }\
         void js_class_name::getprop_##js_class_name##_static(JS_NAMED_PROPGET_ARGS)\
 {\
         v8::Isolate* isolate = info.GetIsolate();\
         v8::Local<v8::Context> context = isolate->GetCurrentContext();\
         IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)isolate->GetData(2);\
         if (pRuntime == NULL) return;\
         IFXJS_Context* cc = pRuntime->GetCurrentContext();\
         v8::String::Utf8Value utf8_value(property);\
         CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());\
         CJS_PropValue value(isolate);\
         value.StartGetting();\
         CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());\
         ASSERT(pJSObj != NULL);\
         class_alternate* pObj = (class_alternate*)pJSObj->GetEmbedObject();\
         ASSERT(pObj != NULL);\
         JS_ErrorString sError;\
         FX_BOOL bRet = FALSE;\
-        MEMLEAKCHECK_1();\
         bRet = pObj->DoProperty(cc, propname.c_str(), value, sError);\
-        MEMLEAKCHECK_2(class_name, L"GetProperty");\
         if (bRet)\
         {\
                 info.GetReturnValue().Set((v8::Handle<v8::Value>)value);\
                 return ;\
         }\
         else\
         {\
                 CFX_ByteString cbName;\
                 cbName.Format("%s.%s", #class_name, L"GetProperty");\
                 JS_Error(NULL,CFX_WideString::FromLocal(cbName), sError);\
@@ skipping 12 matching lines @@
         v8::String::Utf8Value utf8_value(property);\
         CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());\
         CJS_PropValue PropValue(CJS_Value(isolate,value,VT_unknown));\
         PropValue.StartSetting();\
         CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());\
         if(!pJSObj) return;\
         class_alternate* pObj = (class_alternate*)pJSObj->GetEmbedObject();\
         ASSERT(pObj != NULL);\
         JS_ErrorString sError;\
         FX_BOOL bRet = FALSE;\
-        MEMLEAKCHECK_1();\
         bRet = pObj->DoProperty(cc, propname.c_str(), PropValue, sError);\
-        MEMLEAKCHECK_2(class_name,L"PutProperty");\
         if (bRet)\
         {\
                 return ;\
         }\
         else\
         {\
                 CFX_ByteString cbName;\
                 cbName.Format("%s.%s", #class_name, "PutProperty");\
                 JS_Error(NULL,CFX_WideString::FromLocal(cbName), sError);\
                 return ;\
         }\
         JS_Error(NULL,L"PutProperty", L"Embeded object not found!");\
         return ;\
 }\
         void js_class_name::delprop_##js_class_name##_static(JS_PROPDEL_ARGS)\
 {\
         v8::Isolate* isolate = info.GetIsolate();\
         v8::Local<v8::Context> context = isolate->GetCurrentContext();\
         IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)isolate->GetData(2);\
         if (pRuntime == NULL) return;\
         IFXJS_Context* cc = pRuntime->GetCurrentContext();\
         v8::String::Utf8Value utf8_value(property);\
         CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());\
         CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());\
         ASSERT(pJSObj != NULL);\
         class_alternate* pObj = (class_alternate*)pJSObj->GetEmbedObject();\
         ASSERT(pObj != NULL);\
         JS_ErrorString sError;\
         FX_BOOL bRet = FALSE;\
-        MEMLEAKCHECK_1();\
         bRet = pObj->DelProperty(cc, propname.c_str(), sError);\
-        MEMLEAKCHECK_2(class_name,L"DelProperty");\
         if (bRet)\
         {\
                 return ;\
         }\
         else\
         {\
                 CFX_ByteString cbName;\
                 cbName.Format("%s.%s", #class_name, "DelProperty");\
                 return ;\
         }\
@@ skipping 49 matching lines @@
 {\
         pProperties = JS_Class_Properties;\
         nSize = sizeof(JS_Class_Properties)/sizeof(JSPropertySpec)-1;\
 }\
 void js_class_name::GetMethods(JSMethodSpec*& pMethods, int& nSize)\
 {\
         pMethods = JS_Class_Methods;\
         nSize = sizeof(JS_Class_Methods)/sizeof(JSMethodSpec)-1;\
 }
 
-#define JS_SPECIAL_STATIC_METHOD(method_name, class_alternate, class_name)\
-        static void method_name##_static(const v8::FunctionCallbackInfo<v8::Value>& info)\
-{\
-        v8::Isolate* isolate = info.GetIsolate();\
-        v8::Local<v8::Context> context = isolate->GetCurrentContext();\
-        IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)isolate->GetData(2);\
-        if (pRuntime == NULL) return;\
-        IFXJS_Context* cc = pRuntime->GetCurrentContext();\
-        CJS_Parameters parameters;\
-        for (unsigned int i = 0; i<(unsigned int)info.Length(); i++)\
-        {\
-        parameters.push_back(CJS_Value(isolate, info[i], VT_unknown));\
-        }\
-        CJS_Value valueRes(isolate);\
-        CJS_Object* pJSObj = (CJS_Object *)JS_GetPrivate(isolate, info.Holder());\
-        ASSERT(pJSObj != NULL);\
-        class_alternate* pObj = (class_alternate*)pJSObj->GetEmbedObject();\
-        ASSERT(pObj != NULL);\
-        JS_ErrorString sError;\
-        FX_BOOL bRet = FALSE;\
-        MEMLEAKCHECK_1();\
-        bRet = pObj->method_name(cc, parameters, valueRes, sError);\
-        MEMLEAKCHECK_2(class_name, method_name);\
-        if (bRet)\
-        {\
-                info.GetReturnValue().Set(valueRes.ToJSValue());\
-                return ;\
-        }\
-        else\
-        {\
-                CFX_ByteString cbName;\
-                cbName.Format("%s.%s", #class_name, #method_name);\
-                JS_Error(NULL, CFX_WideString::FromLocal(cbName), sError);\
-                return ;\
-        }\
-        JS_Error(NULL,  JS_WIDESTRING(method_name), L"Embeded object not found!");\
-    return ;\
+/* ======================================== GLOBAL METHODS ============================================ */
+
+template <FX_BOOL (*F)(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)>
+void JSGlobalFunc(const char *func_name_string,
+                           const v8::FunctionCallbackInfo<v8::Value>& info) {
+  v8::Isolate* isolate = info.GetIsolate();
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+  IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)isolate->GetData(2);
+  IFXJS_Context* cc = pRuntime->GetCurrentContext();

[brucedawson, 2015/02/18 22:23:34]

Should use the same name for this context variable as above.

+  CJS_Parameters parameters;
+  for (unsigned int i = 0; i<(unsigned int)info.Length(); i++) {
+    parameters.push_back(CJS_Value(isolate, info[i], VT_unknown));
+  }
+  CJS_Value valueRes(isolate);
+  JS_ErrorString sError;
+  if (!(*F)(cc, parameters, valueRes, sError))
+  {
+    JS_Error(NULL, JS_WIDESTRING(fun_name), sError);
+    return;
+  }
+  info.GetReturnValue().Set(valueRes.ToJSValue());
 }
 
-/* ======================================== GLOBAL METHODS ============================================ */
 #define JS_STATIC_GLOBAL_FUN(fun_name) \
-static void fun_name##_static(const v8::FunctionCallbackInfo<v8::Value>& info)\
-{\
-        v8::Isolate* isolate = info.GetIsolate();\
-        v8::Local<v8::Context> context = isolate->GetCurrentContext();\
-        IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)isolate->GetData(2);\
-        if (pRuntime == NULL) return;\
-        IFXJS_Context* cc = pRuntime->GetCurrentContext();\
-        CJS_Parameters parameters;\
-        for (unsigned int i = 0; i<(unsigned int)info.Length(); i++)\
-        {\
-        parameters.push_back(CJS_Value(isolate, info[i], VT_unknown));\
-        }\
-        CJS_Value valueRes(isolate);\
-        JS_ErrorString sError;\
-        if (!fun_name(cc, parameters, valueRes, sError))\
-        {\
-                JS_Error(NULL, JS_WIDESTRING(fun_name), sError);\
-                return ;\
-        }\
-        info.GetReturnValue().Set(valueRes.ToJSValue());\
-        return ;\
-}
+  static void fun_name##_static(const v8::FunctionCallbackInfo<v8::Value>& info) { \
+    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)
 
@@ skipping 35 matching lines @@
 
 #define VALUE_NAME_STRING               L"string"
 #define VALUE_NAME_NUMBER               L"number"
 #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"
 
-#define CLASSNAME_ARRAY                 L"Array"
-#define CLASSNAME_DATE                  L"Date"
-#define CLASSNAME_STRING                L"v8::String"
-
 FXJSVALUETYPE GET_VALUE_TYPE(v8::Handle<v8::Value> p);
 
 #endif //_JS_DEFINE_H_