Merge to XFA: Tidy up JS_Defines.h

Original Review URL: https://codereview.chromium.org/927263003

TBR=brucedawson@chromium.org

Review URL: https://codereview.chromium.org/936613002

1 files changed, 71 insertions, 71 deletions

diff --git a/fpdfsdk/include/javascript/Document.h b/fpdfsdk/include/javascript/Document.h
index 764bbbc102..75a80139ea 100644
--- a/fpdfsdk/include/javascript/Document.h
+++ b/fpdfsdk/include/javascript/Document.h
@@ -86,78 +86,78 @@ public:
 	virtual ~Document();
 
 public:
-	FX_BOOL	ADBE(OBJ_PROP_PARAMS);
-	FX_BOOL	author(OBJ_PROP_PARAMS);
-	FX_BOOL	baseURL(OBJ_PROP_PARAMS);
-	FX_BOOL	bookmarkRoot(OBJ_PROP_PARAMS);
-	FX_BOOL	calculate(OBJ_PROP_PARAMS);
-	FX_BOOL	Collab(OBJ_PROP_PARAMS);
-	FX_BOOL	creationDate(OBJ_PROP_PARAMS);
-	FX_BOOL	creator(OBJ_PROP_PARAMS);
-	FX_BOOL	delay(OBJ_PROP_PARAMS);
-	FX_BOOL	dirty(OBJ_PROP_PARAMS);
-	FX_BOOL	documentFileName(OBJ_PROP_PARAMS);
-	FX_BOOL external(OBJ_PROP_PARAMS);
-	FX_BOOL	filesize(OBJ_PROP_PARAMS);
-	FX_BOOL	icons(OBJ_PROP_PARAMS);
-	FX_BOOL	info(OBJ_PROP_PARAMS);
-	FX_BOOL	keywords(OBJ_PROP_PARAMS);
-	FX_BOOL	layout(OBJ_PROP_PARAMS);
-	FX_BOOL	media(OBJ_PROP_PARAMS);
-	FX_BOOL	modDate(OBJ_PROP_PARAMS);
-	FX_BOOL	mouseX(OBJ_PROP_PARAMS);
-	FX_BOOL	mouseY(OBJ_PROP_PARAMS);
-	FX_BOOL	numFields(OBJ_PROP_PARAMS);
-	FX_BOOL	numPages(OBJ_PROP_PARAMS);
-	FX_BOOL	pageNum(OBJ_PROP_PARAMS);
-	FX_BOOL	pageWindowRect(OBJ_PROP_PARAMS);
-	FX_BOOL	path(OBJ_PROP_PARAMS);
-	FX_BOOL	producer(OBJ_PROP_PARAMS);
-	FX_BOOL	subject(OBJ_PROP_PARAMS);
-	FX_BOOL	title(OBJ_PROP_PARAMS);
-	FX_BOOL	zoom(OBJ_PROP_PARAMS);
-	FX_BOOL	zoomType(OBJ_PROP_PARAMS);
+	FX_BOOL	ADBE(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	author(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	baseURL(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	bookmarkRoot(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	calculate(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	Collab(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	creationDate(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	creator(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	delay(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	dirty(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	documentFileName(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL external(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	filesize(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	icons(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	info(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	keywords(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	layout(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	media(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	modDate(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	mouseX(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	mouseY(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	numFields(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	numPages(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	pageNum(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	pageWindowRect(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	path(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	producer(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	subject(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	title(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	zoom(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+	FX_BOOL	zoomType(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
 
-	FX_BOOL addAnnot(OBJ_METHOD_PARAMS);
-	FX_BOOL	addField(OBJ_METHOD_PARAMS);
-	FX_BOOL	addLink(OBJ_METHOD_PARAMS);
-	FX_BOOL	addIcon(OBJ_METHOD_PARAMS);
-	FX_BOOL	calculateNow(OBJ_METHOD_PARAMS);
-	FX_BOOL	closeDoc(OBJ_METHOD_PARAMS);
-	FX_BOOL	createDataObject(OBJ_METHOD_PARAMS);
-	FX_BOOL deletePages(OBJ_METHOD_PARAMS);
-	FX_BOOL	exportAsText(OBJ_METHOD_PARAMS);
-	FX_BOOL	exportAsFDF(OBJ_METHOD_PARAMS);
-	FX_BOOL	exportAsXFDF(OBJ_METHOD_PARAMS);
-	FX_BOOL extractPages(OBJ_METHOD_PARAMS);
-	FX_BOOL	getAnnot(OBJ_METHOD_PARAMS);
-	FX_BOOL	getAnnots(OBJ_METHOD_PARAMS);
-	FX_BOOL	getAnnot3D(OBJ_METHOD_PARAMS);
-	FX_BOOL	getAnnots3D(OBJ_METHOD_PARAMS);
-	FX_BOOL	getField(OBJ_METHOD_PARAMS);
-	FX_BOOL	getIcon(OBJ_METHOD_PARAMS);
-	FX_BOOL	getLinks(OBJ_METHOD_PARAMS);
-	FX_BOOL	getNthFieldName(OBJ_METHOD_PARAMS);
-	FX_BOOL	getOCGs(OBJ_METHOD_PARAMS);
-	FX_BOOL	getPageBox(OBJ_METHOD_PARAMS);
-	FX_BOOL	getPageNthWord(OBJ_METHOD_PARAMS);
-	FX_BOOL	getPageNthWordQuads(OBJ_METHOD_PARAMS);
-	FX_BOOL	getPageNumWords(OBJ_METHOD_PARAMS);
-	FX_BOOL getPrintParams(OBJ_METHOD_PARAMS);
-	FX_BOOL getURL(OBJ_METHOD_PARAMS);
-	FX_BOOL	importAnFDF(OBJ_METHOD_PARAMS);
-	FX_BOOL	importAnXFDF(OBJ_METHOD_PARAMS);
-	FX_BOOL	importTextData(OBJ_METHOD_PARAMS);
-	FX_BOOL insertPages(OBJ_METHOD_PARAMS);
-	FX_BOOL	mailForm(OBJ_METHOD_PARAMS);
-	FX_BOOL	print(OBJ_METHOD_PARAMS);
-	FX_BOOL	removeField(OBJ_METHOD_PARAMS);
-	FX_BOOL replacePages(OBJ_METHOD_PARAMS);
-	FX_BOOL	resetForm(OBJ_METHOD_PARAMS);
-	FX_BOOL	saveAs(OBJ_METHOD_PARAMS);
-	FX_BOOL	submitForm(OBJ_METHOD_PARAMS);
-	FX_BOOL	mailDoc(OBJ_METHOD_PARAMS);
-	FX_BOOL	removeIcon(OBJ_METHOD_PARAMS);
+	FX_BOOL addAnnot(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	addField(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	addLink(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	addIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	calculateNow(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	closeDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	createDataObject(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL deletePages(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	exportAsText(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	exportAsFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	exportAsXFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL extractPages(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	getAnnot(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	getAnnots(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	getAnnot3D(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	getAnnots3D(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	getField(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	getIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	getLinks(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	getNthFieldName(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	getOCGs(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	getPageBox(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	getPageNthWord(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	getPageNthWordQuads(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	getPageNumWords(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL getPrintParams(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL getURL(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	importAnFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	importAnXFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	importTextData(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL insertPages(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	mailForm(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	print(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	removeField(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL replacePages(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	resetForm(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	saveAs(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	submitForm(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	mailDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL	removeIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
 	
 public:
 	void AttachDoc(CPDFSDK_Document* pDoc);