Replace second set of #defines with templates in JS_Define.h
[pdfium.git] / fpdfsdk / include / javascript / JS_Define.h
index 9a51f69..04833bb 100644 (file)
@@ -12,6 +12,9 @@ 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;
@@ -39,15 +42,12 @@ typedef CFX_WideString      JS_ErrorString;
 #define JS_TRUE                        (unsigned)1
 #define JS_FALSE               (unsigned)0
 
-
-#define CJS_PointsArray                CFX_ArrayTemplate<float>
-#define CJS_IntArray           CFX_ArrayTemplate<int>
+typedef CFX_ArrayTemplate<float> CJS_PointsArray;
+typedef CFX_ArrayTemplate<int> CJS_IntArray;
 
 /* ====================================== PUBLIC DEFINE SPEC ============================================== */
 #define JS_WIDESTRING(widestring) L###widestring
 
-#define OBJ_PROP_PARAMS                        IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError
-#define OBJ_METHOD_PARAMS              IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError
 #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},
@@ -60,151 +60,116 @@ typedef CFX_WideString    JS_ErrorString;
 #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(JS_PROPGET_ARGS)\
-{\
-       v8::Isolate* isolate = info.GetIsolate();\
-       v8::Local<v8::Context> context = isolate->GetCurrentContext();\
-       v8::Local<v8::Value> v = context->GetEmbedderData(1);\
-       ASSERT(!v.IsEmpty());\
-       if(v.IsEmpty()) return;\
-       v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);\
-       IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\
-       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();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);
+  v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);
+  IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
+  IFXJS_Context* pContext = pRuntime->GetCurrentContext();
+  CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());
+  C* pObj = reinterpret_cast<C*>(pJSObj->GetEmbedObject());
+  JS_ErrorString sError;
+  CJS_PropValue value(isolate);
+  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(JS_PROPPUT_ARGS)\
-{\
-       v8::Isolate* isolate = info.GetIsolate();\
-       v8::Local<v8::Context> context = isolate->GetCurrentContext();\
-       v8::Local<v8::Value> v = context->GetEmbedderData(1);\
-       ASSERT(!v.IsEmpty());\
-       if(v.IsEmpty()) return;\
-       v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);\
-       IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\
-       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();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);
+  v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);
+  IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
+  IFXJS_Context* pContext = pRuntime->GetCurrentContext();
+  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(JS_METHOD_ARGS)\
-{\
-       v8::Isolate* isolate = info.GetIsolate();\
-       v8::Local<v8::Context> context = isolate->GetCurrentContext();\
-       v8::Local<v8::Value> v = context->GetEmbedderData(1);\
-       ASSERT(!v.IsEmpty());\
-       if(v.IsEmpty()) return;\
-       v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);\
-       IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\
-       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();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);
+  v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);
+  IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
+  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());
+  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) \
@@ -312,6 +277,90 @@ void js_class_name::GetConsts(JSConstSpec*& pConsts, int& nSize)\
 
 /* ===================================== SPECIAL JS CLASS =============================================== */
 
+template <class Alt>
+void JSSpecialPropQuery(const char *, v8::Local<v8::String> property,const v8::PropertyCallbackInfo<v8::Integer>& info) {
+  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 = reinterpret_cast<CJS_Object*>(JS_GetPrivate(isolate, info.Holder()));
+  Alt* pObj = reinterpret_cast<Alt*>(pJSObj->GetEmbedObject());
+  FX_BOOL bRet = pObj->QueryProperty(propname.c_str());
+  info.GetReturnValue().Set(bRet ? 4 : 0);
+}
+
+template <class Alt>
+void JSSpecialPropGet(const char* class_name,
+                      v8::Local<v8::String> property,
+                      const v8::PropertyCallbackInfo<v8::Value>& info) {
+  v8::Isolate* isolate = info.GetIsolate();
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);
+  v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);
+  IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
+  IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext();
+  CJS_Object* pJSObj = reinterpret_cast<CJS_Object*>(JS_GetPrivate(isolate, info.Holder()));
+  Alt* pObj = reinterpret_cast<Alt*>(pJSObj->GetEmbedObject());
+  v8::String::Utf8Value utf8_value(property);
+  CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());
+  JS_ErrorString sError;
+  CJS_PropValue value(isolate);
+  value.StartGetting();
+  if (!pObj->DoProperty(pRuntimeContext, propname.c_str(), value, sError)) {
+    CFX_ByteString cbName;
+    cbName.Format("%s.%s", class_name, L"GetProperty");
+    JS_Error(NULL,CFX_WideString::FromLocal(cbName), sError);
+    return;
+  }
+  info.GetReturnValue().Set((v8::Handle<v8::Value>)value);
+}
+
+template <class Alt>
+void JSSpecialPropPut(const char* class_name,
+                      v8::Local<v8::String> property,
+                      v8::Local<v8::Value> value,
+                      const v8::PropertyCallbackInfo<v8::Value>& info) {
+  v8::Isolate* isolate = info.GetIsolate();
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);
+  v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);
+  IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
+  IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext();
+  CJS_Object* pJSObj = reinterpret_cast<CJS_Object*>(JS_GetPrivate(isolate, info.Holder()));
+  Alt* pObj = reinterpret_cast<Alt*>(pJSObj->GetEmbedObject());
+  v8::String::Utf8Value utf8_value(property);
+  CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());
+  JS_ErrorString sError;
+  CJS_PropValue PropValue(CJS_Value(isolate,value,VT_unknown));
+  PropValue.StartSetting();
+  if (!pObj->DoProperty(pRuntimeContext, propname.c_str(), PropValue, sError)) {
+    CFX_ByteString cbName;
+    cbName.Format("%s.%s", class_name, "PutProperty");
+    JS_Error(NULL,CFX_WideString::FromLocal(cbName), sError);
+  }
+}
+
+template <class Alt>
+void JSSpecialPropDel(const char* class_name,
+                      v8::Local<v8::String> property,
+                      const v8::PropertyCallbackInfo<v8::Boolean>& info) {
+  v8::Isolate* isolate = info.GetIsolate();
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);
+  v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);
+  IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
+  IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext();
+  CJS_Object* pJSObj = reinterpret_cast<CJS_Object*>(JS_GetPrivate(isolate, info.Holder()));
+  Alt* pObj = reinterpret_cast<Alt*>(pJSObj->GetEmbedObject());
+  v8::String::Utf8Value utf8_value(property);
+  CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());
+  JS_ErrorString sError;
+  if (!pObj->DelProperty(pRuntimeContext, propname.c_str(), sError)) {
+    CFX_ByteString cbName;
+    cbName.Format("%s.%s", class_name, "DelProperty");
+    // Probably a missing call to JS_Error().
+  }
+}
+
 #define DECLARE_SPECIAL_JS_CLASS(js_class_name) \
        static JSBool JSConstructor(IFXJS_Context* cc, JSFXObject obj, JSFXObject global);\
        static JSBool JSDestructor(JSFXObject obj);\
@@ -323,146 +372,25 @@ void js_class_name::GetConsts(JSConstSpec*& pConsts, int& nSize)\
        static JSMethodSpec     JS_Class_Methods[];\
        static int Init(IJS_Runtime* pRuntime, FXJSOBJTYPE eObjType);\
        static const wchar_t* m_pClassName;\
-       static void queryprop_##js_class_name##_static(JS_PROPQUERY_ARGS);\
-       static void getprop_##js_class_name##_static(JS_NAMED_PROPGET_ARGS);\
-       static void putprop_##js_class_name##_static(JS_NAMED_PROPPUT_ARGS);\
-       static void delprop_##js_class_name##_static(JS_PROPDEL_ARGS)
+       static void queryprop_##js_class_name##_static(v8::Local<v8::String> property,const v8::PropertyCallbackInfo<v8::Integer>& info);\
+       static void getprop_##js_class_name##_static(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value>& info);\
+       static void putprop_##js_class_name##_static(v8::Local<v8::String> property,v8::Local<v8::Value> value,const v8::PropertyCallbackInfo<v8::Value>& info);\
+       static void delprop_##js_class_name##_static(v8::Local<v8::String> property,const v8::PropertyCallbackInfo<v8::Boolean>& info)
 
 #define IMPLEMENT_SPECIAL_JS_CLASS(js_class_name, class_alternate, class_name) \
 const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
-       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();\
-       v8::Local<v8::Value> v = context->GetEmbedderData(1);\
-       ASSERT(!v.IsEmpty());\
-       if(v.IsEmpty()) return;\
-       v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);\
-       IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\
-       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);\
-               return ;\
-       }\
-       JS_Error(NULL,L"GetProperty", L"Embeded object not found!");\
-       return ;\
-}\
-       void js_class_name::putprop_##js_class_name##_static(JS_NAMED_PROPPUT_ARGS)\
-{\
-       v8::Isolate* isolate = info.GetIsolate();\
-       v8::Local<v8::Context> context = isolate->GetCurrentContext();\
-       v8::Local<v8::Value> v = context->GetEmbedderData(1);\
-       ASSERT(!v.IsEmpty());\
-       if(v.IsEmpty()) return;\
-       v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);\
-       IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\
-       IFXJS_Context* cc = pRuntime->GetCurrentContext();\
-       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::queryprop_##js_class_name##_static(v8::Local<v8::String> property,const v8::PropertyCallbackInfo<v8::Integer>& info) { \
+  JSSpecialPropQuery<class_alternate>(#class_name, property, info);     \
 }\
-       void js_class_name::delprop_##js_class_name##_static(JS_PROPDEL_ARGS)\
-{\
-       v8::Isolate* isolate = info.GetIsolate();\
-       v8::Local<v8::Context> context = isolate->GetCurrentContext();\
-       v8::Local<v8::Value> v = context->GetEmbedderData(1);\
-       ASSERT(!v.IsEmpty());\
-       if(v.IsEmpty()) return;\
-       v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);\
-       IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\
-       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 ;\
-       }\
-       return ;\
+void js_class_name::getprop_##js_class_name##_static(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value>& info) { \
+  JSSpecialPropGet<class_alternate>(#class_name, property, info); \
+}                                                                       \
+void js_class_name::putprop_##js_class_name##_static(v8::Local<v8::String> property,v8::Local<v8::Value> value,const v8::PropertyCallbackInfo<v8::Value>& info) {\
+  JSSpecialPropPut<class_alternate>(#class_name, property, value, info); \
 }\
+void js_class_name::delprop_##js_class_name##_static(v8::Local<v8::String> property,const v8::PropertyCallbackInfo<v8::Boolean>& info) { \
+  JSSpecialPropDel<class_alternate>(#class_name, property, info); \
+} \
 JSBool js_class_name::JSConstructor(IFXJS_Context* cc, JSFXObject  obj,JSFXObject  global)\
 {\
        CJS_Object* pObj = FX_NEW js_class_name(obj);\
@@ -520,75 +448,35 @@ void js_class_name::GetMethods(JSMethodSpec*& pMethods, int& nSize)\
        nSize = sizeof(JS_Class_Methods)/sizeof(JSMethodSpec)-1;\
 }
 
-#define JS_SPECIAL_STATIC_METHOD(method_name, class_alternate, class_name)\
-       static void method_name##_static(JS_METHOD_ARGS)\
-{\
-       v8::Isolate* isolate = info.GetIsolate();\
-       v8::Local<v8::Context> context = isolate->GetCurrentContext();\
-       v8::Local<v8::Value> v = context->GetEmbedderData(1);\
-       ASSERT(!v.IsEmpty());\
-       if(v.IsEmpty()) return;\
-       v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);\
-       IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\
-       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();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);
+  v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);
+  IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
+  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 (!(*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(JS_METHOD_ARGS)\
-{\
-       v8::Isolate* isolate = info.GetIsolate();\
-       v8::Local<v8::Context> context = isolate->GetCurrentContext();\
-       v8::Local<v8::Value> v = context->GetEmbedderData(1);\
-       ASSERT(!v.IsEmpty());\
-       if(v.IsEmpty()) return;\
-       v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);\
-       IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\
-       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[]; \
@@ -644,62 +532,6 @@ if (JS_DefineGlobalConst(pRuntime, (const wchar_t*)ArrayName, prop.ToJSValue())
 #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"
-
-extern const unsigned int JSCONST_nStringHash;
-extern const unsigned int JSCONST_nNumberHash;
-extern const unsigned int JSCONST_nBoolHash;
-extern const unsigned int JSCONST_nDateHash;
-extern const unsigned int JSCONST_nObjectHash;
-extern const unsigned int JSCONST_nFXobjHash;
-extern const unsigned int JSCONST_nNullHash;
-extern const unsigned int JSCONST_nUndefHash;
-
-static FXJSVALUETYPE GET_VALUE_TYPE(v8::Handle<v8::Value> p)
-{
-
-               const unsigned int nHash = JS_CalcHash(JS_GetTypeof(p));
-
-               if (nHash == JSCONST_nUndefHash)
-                       return VT_undefined;
-               else if (nHash == JSCONST_nNullHash)
-                       return VT_null;
-               else if (nHash == JSCONST_nStringHash)
-                       return VT_string;
-               else if (nHash == JSCONST_nNumberHash)
-                       return VT_number;
-               else if (nHash == JSCONST_nBoolHash)
-                       return VT_boolean;
-               else if (nHash == JSCONST_nDateHash)
-                       return VT_date;
-               else if (nHash == JSCONST_nObjectHash)
-                       return VT_object;               
-               else if (nHash == JSCONST_nFXobjHash)
-                       return VT_fxobject;
-
-               /*
-               const char * sType = p->getTypeof()->toDchars();
-               if (strcmp(sType,VALUE_NAME_STRING) == 0)
-                       return VT_string;
-               else if (strcmp(sType,VALUE_NAME_NUMBER) == 0)
-                       return VT_number;
-               else if (strcmp(sType,VALUE_NAME_BOOLEAN) == 0)
-                       return VT_boolean;
-               else if (strcmp(sType,VALUE_NAME_DATE) == 0)
-                       return VT_date;
-               else if (strcmp(sType,VALUE_NAME_OBJECT) == 0)
-                       return VT_object;
-               else if (strcmp(sType,VALUE_NAME_FXOBJ) == 0)
-                       return VT_object;
-               else if (strcmp(sType,VALUE_NAME_NULL) == 0)
-                       return VT_null;
-               else if (strcmp(sType,VALUE_NAME_UNDEFINED) == 0)
-                       return VT_undefined;
-                       */
-
-       return VT_unknown;
-}
+FXJSVALUETYPE GET_VALUE_TYPE(v8::Handle<v8::Value> p);
 
 #endif //_JS_DEFINE_H_