Replace second set of #defines with templates in JS_Define.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 24 matching lines @@
         const wchar_t* pName;
         v8::FunctionCallback pMethodCall;
         unsigned nParamNum;
 };
 
 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;

[brucedawson, 2015/02/20 23:52:40]

Why was this ever a #define? Sigh...

 
 /* ====================================== 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[] = {
@@ skipping 213 matching lines @@
         return -1;\
 }\
 void js_class_name::GetConsts(JSConstSpec*& pConsts, int& nSize)\
 {\
         pConsts = JS_Class_Consts;\
         nSize = sizeof(JS_Class_Consts)/sizeof(JSConstSpec)-1;\
 }
 
 /* ===================================== 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* cc = pRuntime->GetCurrentContext();

[brucedawson, 2015/02/20 23:52:40]

Consider naming this pRuntimeContext or something like that? cc is rather short
and cryptic.

[Tom Sepez, 2015/02/23 17:58:30]

Done.

+  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(cc, 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* cc = pRuntime->GetCurrentContext();

[brucedawson, 2015/02/20 23:52:40]

Consider naming this pRuntimeContext or something like that? cc is rather short
and cryptic.

[Tom Sepez, 2015/02/23 17:58:30]

Done.

+  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(cc, 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* cc = pRuntime->GetCurrentContext();

[Tom Sepez, 2015/02/23 17:58:30]

renamed here too.

+  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(cc, 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);\
         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[];\
         static JSPropertySpec JS_Class_Properties[];\
         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;\
-        bRet = pObj->QueryProperty(propname.c_str());\
-        if (bRet)\
-        {\
-                info.GetReturnValue().Set(0x004);\
-                return ;\
-        }\
-        else\
-        {\
-                info.GetReturnValue().Set(0);\
-                return ;\
-        }\
-        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::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;\
-        bRet = pObj->DoProperty(cc, propname.c_str(), value, sError);\
-        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!");\

[brucedawson, 2015/02/20 23:52:40]

Well that's a weird line of code...

[Tom Sepez, 2015/02/23 17:58:30]

If by weird, you mean unreachable, given returns in both branches of the
if-statement above, then yes.

-        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::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;\
-        bRet = pObj->DoProperty(cc, propname.c_str(), PropValue, sError);\
-        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();\
-        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;\
-        bRet = pObj->DelProperty(cc, propname.c_str(), sError);\
-        if (bRet)\
-        {\
-                return ;\
-        }\
-        else\
-        {\
-                CFX_ByteString cbName;\
-                cbName.Format("%s.%s", #class_name, "DelProperty");\
-                return ;\
-        }\
-        return ;\
-}\
+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);\
         pObj->SetEmbedObject(FX_NEW class_alternate(pObj));\
         JS_SetPrivate(NULL,obj, (void*)pObj); \
         pObj->InitInstance(cc);\
         return JS_TRUE;\
 }\
 \
 JSBool js_class_name::JSDestructor(JSFXObject obj) \
@@ skipping 124 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_