Merge to XFA: Kill off JS_ErrorString type.

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_
 
 #include "../jsapi/fxjs_v8.h"
 #include "resource.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
 {
         const wchar_t* pName;
         v8::AccessorGetterCallback pPropGet;
         v8::AccessorSetterCallback pPropPut;
 };
 
 struct JSMethodSpec
 {
         const wchar_t* pName;
         v8::FunctionCallback pMethodCall;
         unsigned nParamNum;
 };
 
-#define JS_TRUE                 (unsigned)1
-#define JS_FALSE                (unsigned)0
-
-typedef CFX_WideString JS_ErrorString;
-typedef CFX_ArrayTemplate<float> CJS_PointsArray;
-typedef CFX_ArrayTemplate<int> CJS_IntArray;
-
 /* ====================================== 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[] = {
 #define JS_STATIC_PROP_ENTRY(prop_name) {JS_WIDESTRING(prop_name), get_##prop_name##_static, set_##prop_name##_static},
@@ skipping 93 matching lines @@
 #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>( \
         #method_name, #class_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 void JSConstructor(IFXJS_Context* cc, JSFXObject obj,JSFXObject global);\
+        static void JSDestructor(JSFXObject obj);\
         static int Init(IJS_Runtime* pRuntime, FXJSOBJTYPE eObjType);\
         static JSConstSpec JS_Class_Consts[];\
         static JSPropertySpec JS_Class_Properties[];\
         static JSMethodSpec     JS_Class_Methods[];\
         static const wchar_t* m_pClassName
 
 #define IMPLEMENT_JS_CLASS_RICH(js_class_name, class_alternate, class_name) \
 const wchar_t* js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
-JSBool js_class_name::JSConstructor(IFXJS_Context* cc, JSFXObject obj, JSFXObject global)\
+void 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) \
+void js_class_name::JSDestructor(JSFXObject obj) \
 {\
         js_class_name* pObj = (js_class_name*)JS_GetPrivate(NULL,obj);\
         ASSERT(pObj != NULL);\
         pObj->ExitInstance();\
         delete pObj;\
-        return JS_TRUE;\
 }\
 \
 int js_class_name::Init(IJS_Runtime* pRuntime, FXJSOBJTYPE eObjType)\
 {\
         int nObjDefnID = JS_DefineObj(pRuntime, js_class_name::m_pClassName, eObjType, JSConstructor, JSDestructor, 0);\
         if (nObjDefnID >= 0)\
         {\
                 for (int j=0, szj=sizeof(JS_Class_Properties)/sizeof(JSPropertySpec)-1; j<szj; j++)\
                 {\
                         if (JS_DefineObjProperty(pRuntime, nObjDefnID, JS_Class_Properties[j].pName, JS_Class_Properties[j].pPropGet, JS_Class_Properties[j].pPropPut) < 0) return -1;\
@@ skipping 109 matching lines @@
   CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());
   CFX_WideString 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);\
+        static void JSConstructor(IFXJS_Context* cc, JSFXObject obj, JSFXObject global);\
+        static void JSDestructor(JSFXObject obj);\
         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(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(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(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)\
+void 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) \
+void js_class_name::JSDestructor(JSFXObject obj) \
 {\
         js_class_name* pObj = (js_class_name*)JS_GetPrivate(NULL,obj);\
         ASSERT(pObj != NULL);\
         pObj->ExitInstance();\
         delete pObj;\
-        return JS_TRUE;\
 }\
 \
 int js_class_name::Init(IJS_Runtime* pRuntime, FXJSOBJTYPE eObjType)\
 {\
 \
         int nObjDefnID = JS_DefineObj(pRuntime, js_class_name::m_pClassName, eObjType, JSConstructor, JSDestructor, 0);\
 \
         if (nObjDefnID >= 0)\
         {\
                 for (int j=0, szj=sizeof(JS_Class_Properties)/sizeof(JSPropertySpec)-1; j<szj; j++)\
@@ skipping 89 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_