From e1671bd3158f5d78f66647ec5489e9538bd4bc36 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Mon, 2 Mar 2015 14:20:10 -0800
Subject: Kill off JS_ErrorString type.

This provides no benefit, and reduces transparency.

Along the way:
Kill off some unused/commented-out code.
Return void where a bool return doesn't make sense.
Remove a pointless template type.
Remove now unused constants and types.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/971033002
---
 fpdfsdk/include/javascript/JS_Define.h | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

(limited to 'fpdfsdk/include/javascript/JS_Define.h')

diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h
index 6edcc97aff..df17467187 100644
--- a/fpdfsdk/include/javascript/JS_Define.h
+++ b/fpdfsdk/include/javascript/JS_Define.h
@@ -13,7 +13,6 @@
 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"
@@ -40,13 +39,6 @@ struct JSMethodSpec
 	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
 
@@ -169,8 +161,8 @@ void JSMethod(const char* method_name_string,
 /* ===================================== 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[];\
@@ -179,22 +171,20 @@ void JSMethod(const char* method_name_string,
 
 #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)\
@@ -330,8 +320,8 @@ void JSSpecialPropDel(const char* class_name,
 }
 
 #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[];\
@@ -356,22 +346,20 @@ void js_class_name::putprop_##js_class_name##_static(v8::Local<v8::String> prope
 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)\
-- 
cgit v1.2.3