Merge to XFA: Tidy up JS_Defines.h

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;
@@ skipping 28 matching lines @@
 #define JS_TRUE                 (unsigned)1
 #define JS_FALSE                (unsigned)0
 
 
 #define CJS_PointsArray         CFX_ArrayTemplate<float>
 #define CJS_IntArray            CFX_ArrayTemplate<int>
 
 /* ====================================== 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},
 #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[] = {
@@ skipping 21 matching lines @@
         }
 #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)\
+  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);\
@@ skipping 12 matching lines @@
         else\
         {\
         CFX_ByteString cbName;\
                 cbName.Format("%s.%s", #class_name, #prop_name);\
                 JS_Error(NULL,CFX_WideString::FromLocal(cbName), sError);\
                 return ;\
         }\
 }
 
 #define JS_STATIC_PROP_SET(prop_name, class_name)\
-        static void set_##prop_name##_static(JS_PROPPUT_ARGS)\
+  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);\
@@ skipping 17 matching lines @@
         }\
 }
 
 #define JS_STATIC_PROP(prop_name, class_name)\
 JS_STATIC_PROP_GET(prop_name, class_name);\
 JS_STATIC_PROP_SET(prop_name, class_name)
 
 /* ========================================= METHOD CALLBACK =========================================== */
 
 #define JS_STATIC_METHOD(method_name, class_name)\
-        static void method_name##_static(JS_METHOD_ARGS)\
+  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));\
@@ skipping 322 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(JS_METHOD_ARGS)\
+        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));\
@@ skipping 19 matching lines @@
                 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 ============================================ */
 #define JS_STATIC_GLOBAL_FUN(fun_name) \
-static void fun_name##_static(JS_METHOD_ARGS)\
+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));\
@@ skipping 60 matching lines @@
 #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"
 
-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_