summaryrefslogtreecommitdiff
path: root/fpdfsdk/include
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/include')
-rw-r--r--fpdfsdk/include/javascript/Document.h142
-rw-r--r--fpdfsdk/include/javascript/Field.h156
-rw-r--r--fpdfsdk/include/javascript/Icon.h2
-rw-r--r--fpdfsdk/include/javascript/JS_Define.h69
-rw-r--r--fpdfsdk/include/javascript/PublicMethods.h44
-rw-r--r--fpdfsdk/include/javascript/app.h70
-rw-r--r--fpdfsdk/include/javascript/color.h28
-rw-r--r--fpdfsdk/include/javascript/console.h8
-rw-r--r--fpdfsdk/include/javascript/event.h40
-rw-r--r--fpdfsdk/include/javascript/global.h2
-rw-r--r--fpdfsdk/include/javascript/report.h4
-rw-r--r--fpdfsdk/include/javascript/util.h10
-rw-r--r--fpdfsdk/include/jsapi/fxjs_v8.h6
13 files changed, 264 insertions, 317 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);
diff --git a/fpdfsdk/include/javascript/Field.h b/fpdfsdk/include/javascript/Field.h
index 2aea85afa4..8bbb8cd06c 100644
--- a/fpdfsdk/include/javascript/Field.h
+++ b/fpdfsdk/include/javascript/Field.h
@@ -98,85 +98,85 @@ public:
Field(CJS_Object* pJSObject);
virtual ~Field(void);
- FX_BOOL alignment(OBJ_PROP_PARAMS);
- FX_BOOL borderStyle(OBJ_PROP_PARAMS);
- FX_BOOL buttonAlignX(OBJ_PROP_PARAMS);
- FX_BOOL buttonAlignY(OBJ_PROP_PARAMS);
- FX_BOOL buttonFitBounds(OBJ_PROP_PARAMS);
- FX_BOOL buttonPosition(OBJ_PROP_PARAMS);
- FX_BOOL buttonScaleHow(OBJ_PROP_PARAMS);
- FX_BOOL buttonScaleWhen(OBJ_PROP_PARAMS);
- FX_BOOL calcOrderIndex(OBJ_PROP_PARAMS);
- FX_BOOL charLimit(OBJ_PROP_PARAMS);
- FX_BOOL comb(OBJ_PROP_PARAMS);
- FX_BOOL commitOnSelChange(OBJ_PROP_PARAMS);
- FX_BOOL currentValueIndices(OBJ_PROP_PARAMS);
- FX_BOOL defaultStyle(OBJ_PROP_PARAMS);
- FX_BOOL defaultValue(OBJ_PROP_PARAMS);
- FX_BOOL doNotScroll(OBJ_PROP_PARAMS);
- FX_BOOL doNotSpellCheck(OBJ_PROP_PARAMS);
- FX_BOOL delay(OBJ_PROP_PARAMS);
- FX_BOOL display(OBJ_PROP_PARAMS);
- FX_BOOL doc(OBJ_PROP_PARAMS);
- FX_BOOL editable(OBJ_PROP_PARAMS);
- FX_BOOL exportValues(OBJ_PROP_PARAMS);
- FX_BOOL fileSelect(OBJ_PROP_PARAMS);
- FX_BOOL fillColor(OBJ_PROP_PARAMS);
- FX_BOOL hidden(OBJ_PROP_PARAMS);
- FX_BOOL highlight(OBJ_PROP_PARAMS);
- FX_BOOL lineWidth(OBJ_PROP_PARAMS);
- FX_BOOL multiline(OBJ_PROP_PARAMS);
- FX_BOOL multipleSelection(OBJ_PROP_PARAMS);
- FX_BOOL name(OBJ_PROP_PARAMS);
- FX_BOOL numItems(OBJ_PROP_PARAMS);
- FX_BOOL page(OBJ_PROP_PARAMS);
- FX_BOOL password(OBJ_PROP_PARAMS);
- FX_BOOL print(OBJ_PROP_PARAMS);
- FX_BOOL radiosInUnison(OBJ_PROP_PARAMS);
- FX_BOOL readonly(OBJ_PROP_PARAMS);
- FX_BOOL rect(OBJ_PROP_PARAMS);
- FX_BOOL required(OBJ_PROP_PARAMS);
- FX_BOOL richText(OBJ_PROP_PARAMS);
- FX_BOOL richValue(OBJ_PROP_PARAMS);
- FX_BOOL rotation(OBJ_PROP_PARAMS);
- FX_BOOL strokeColor(OBJ_PROP_PARAMS);
- FX_BOOL style(OBJ_PROP_PARAMS);
- FX_BOOL submitName(OBJ_PROP_PARAMS);
- FX_BOOL textColor(OBJ_PROP_PARAMS);
- FX_BOOL textFont(OBJ_PROP_PARAMS);
- FX_BOOL textSize(OBJ_PROP_PARAMS);
- FX_BOOL type(OBJ_PROP_PARAMS);
- FX_BOOL userName(OBJ_PROP_PARAMS);
- FX_BOOL value(OBJ_PROP_PARAMS);
- FX_BOOL valueAsString(OBJ_PROP_PARAMS);
- FX_BOOL source(OBJ_PROP_PARAMS);
+ FX_BOOL alignment(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL borderStyle(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL buttonAlignX(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL buttonAlignY(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL buttonFitBounds(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL buttonPosition(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL buttonScaleHow(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL buttonScaleWhen(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL calcOrderIndex(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL charLimit(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL comb(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL commitOnSelChange(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL currentValueIndices(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL defaultStyle(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL defaultValue(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL doNotScroll(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL doNotSpellCheck(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL delay(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL display(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL doc(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL editable(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL exportValues(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL fileSelect(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL fillColor(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL hidden(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL highlight(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL lineWidth(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL multiline(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL multipleSelection(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL name(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL numItems(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL page(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL password(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL print(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL radiosInUnison(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL readonly(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL rect(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL required(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL richText(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL richValue(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL rotation(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL strokeColor(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL style(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL submitName(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL textColor(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL textFont(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL textSize(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL type(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL userName(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL value(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL valueAsString(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL source(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
- FX_BOOL browseForFileToSubmit(OBJ_METHOD_PARAMS);
- FX_BOOL buttonGetCaption(OBJ_METHOD_PARAMS);
- FX_BOOL buttonGetIcon(OBJ_METHOD_PARAMS);
- FX_BOOL buttonImportIcon(OBJ_METHOD_PARAMS);
- FX_BOOL buttonSetCaption(OBJ_METHOD_PARAMS);
- FX_BOOL buttonSetIcon(OBJ_METHOD_PARAMS);
- FX_BOOL checkThisBox(OBJ_METHOD_PARAMS);
- FX_BOOL clearItems(OBJ_METHOD_PARAMS);
- FX_BOOL defaultIsChecked(OBJ_METHOD_PARAMS);
- FX_BOOL deleteItemAt(OBJ_METHOD_PARAMS);
- FX_BOOL getArray(OBJ_METHOD_PARAMS);
- FX_BOOL getItemAt(OBJ_METHOD_PARAMS);
- FX_BOOL getLock(OBJ_METHOD_PARAMS);
- FX_BOOL insertItemAt(OBJ_METHOD_PARAMS);
- FX_BOOL isBoxChecked(OBJ_METHOD_PARAMS);
- FX_BOOL isDefaultChecked(OBJ_METHOD_PARAMS);
- FX_BOOL setAction(OBJ_METHOD_PARAMS);
- FX_BOOL setFocus(OBJ_METHOD_PARAMS);
- FX_BOOL setItems(OBJ_METHOD_PARAMS);
- FX_BOOL setLock(OBJ_METHOD_PARAMS);
- FX_BOOL signatureGetModifications(OBJ_METHOD_PARAMS);
- FX_BOOL signatureGetSeedValue(OBJ_METHOD_PARAMS);
- FX_BOOL signatureInfo(OBJ_METHOD_PARAMS);
- FX_BOOL signatureSetSeedValue(OBJ_METHOD_PARAMS);
- FX_BOOL signatureSign(OBJ_METHOD_PARAMS);
- FX_BOOL signatureValidate(OBJ_METHOD_PARAMS);
+ FX_BOOL browseForFileToSubmit(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL buttonGetCaption(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL buttonGetIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL buttonImportIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL buttonSetCaption(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL buttonSetIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL checkThisBox(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL clearItems(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL defaultIsChecked(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL deleteItemAt(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL getArray(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL getItemAt(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL getLock(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL insertItemAt(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL isBoxChecked(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL isDefaultChecked(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL setAction(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL setFocus(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL setItems(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL setLock(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL signatureGetModifications(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL signatureGetSeedValue(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL signatureInfo(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL signatureSetSeedValue(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL signatureSign(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL signatureValidate(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
public:
static void SetAlignment(CPDFSDK_Document* pDocument, const CFX_WideString& swFieldName, int nControlIndex, const CFX_ByteString& string);
diff --git a/fpdfsdk/include/javascript/Icon.h b/fpdfsdk/include/javascript/Icon.h
index 9426d322bd..0bb4d0aa25 100644
--- a/fpdfsdk/include/javascript/Icon.h
+++ b/fpdfsdk/include/javascript/Icon.h
@@ -14,7 +14,7 @@ public:
virtual ~Icon();
public:
- FX_BOOL name(OBJ_PROP_PARAMS);
+ FX_BOOL name(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
public:
void SetStream(CPDF_Stream* pIconStream);
diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h
index 6b7af41d5f..90bce29ebb 100644
--- a/fpdfsdk/include/javascript/JS_Define.h
+++ b/fpdfsdk/include/javascript/JS_Define.h
@@ -46,8 +46,6 @@ typedef CFX_WideString JS_ErrorString;
/* ====================================== 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},
@@ -89,7 +87,8 @@ typedef CFX_WideString JS_ErrorString;
/* ======================================== 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();\
@@ -122,7 +121,9 @@ typedef CFX_WideString JS_ErrorString;
}
#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();\
@@ -160,7 +161,7 @@ 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();\
@@ -503,7 +504,7 @@ void js_class_name::GetMethods(JSMethodSpec*& pMethods, int& nSize)\
}
#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();\
@@ -543,7 +544,7 @@ void js_class_name::GetMethods(JSMethodSpec*& pMethods, int& nSize)\
/* ======================================== 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();\
@@ -624,58 +625,6 @@ if (JS_DefineGlobalConst(pRuntime, (const wchar_t*)ArrayName, prop.ToJSValue())
#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_
diff --git a/fpdfsdk/include/javascript/PublicMethods.h b/fpdfsdk/include/javascript/PublicMethods.h
index 8d4e68392f..40b0ce9605 100644
--- a/fpdfsdk/include/javascript/PublicMethods.h
+++ b/fpdfsdk/include/javascript/PublicMethods.h
@@ -14,28 +14,28 @@ public:
virtual ~CJS_PublicMethods(void){};
public:
- static FX_BOOL AFNumber_Format(OBJ_METHOD_PARAMS);
- static FX_BOOL AFNumber_Keystroke(OBJ_METHOD_PARAMS);
- static FX_BOOL AFPercent_Format(OBJ_METHOD_PARAMS);
- static FX_BOOL AFPercent_Keystroke(OBJ_METHOD_PARAMS);
- static FX_BOOL AFDate_FormatEx(OBJ_METHOD_PARAMS);
- static FX_BOOL AFDate_KeystrokeEx(OBJ_METHOD_PARAMS);
- static FX_BOOL AFDate_Format(OBJ_METHOD_PARAMS);
- static FX_BOOL AFDate_Keystroke(OBJ_METHOD_PARAMS);
- static FX_BOOL AFTime_FormatEx(OBJ_METHOD_PARAMS); //
- static FX_BOOL AFTime_KeystrokeEx(OBJ_METHOD_PARAMS);
- static FX_BOOL AFTime_Format(OBJ_METHOD_PARAMS);
- static FX_BOOL AFTime_Keystroke(OBJ_METHOD_PARAMS);
- static FX_BOOL AFSpecial_Format(OBJ_METHOD_PARAMS);
- static FX_BOOL AFSpecial_Keystroke(OBJ_METHOD_PARAMS);
- static FX_BOOL AFSpecial_KeystrokeEx(OBJ_METHOD_PARAMS);//
- static FX_BOOL AFSimple(OBJ_METHOD_PARAMS);
- static FX_BOOL AFMakeNumber(OBJ_METHOD_PARAMS);
- static FX_BOOL AFSimple_Calculate(OBJ_METHOD_PARAMS);
- static FX_BOOL AFRange_Validate(OBJ_METHOD_PARAMS);
- static FX_BOOL AFMergeChange(OBJ_METHOD_PARAMS);
- static FX_BOOL AFParseDateEx(OBJ_METHOD_PARAMS);
- static FX_BOOL AFExtractNums(OBJ_METHOD_PARAMS);
+ static FX_BOOL AFNumber_Format(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFNumber_Keystroke(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFPercent_Format(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFPercent_Keystroke(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFDate_FormatEx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFDate_KeystrokeEx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFDate_Format(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFDate_Keystroke(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFTime_FormatEx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError); //
+ static FX_BOOL AFTime_KeystrokeEx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFTime_Format(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFTime_Keystroke(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFSpecial_Format(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFSpecial_Keystroke(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFSpecial_KeystrokeEx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);//
+ static FX_BOOL AFSimple(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFMakeNumber(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFSimple_Calculate(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFRange_Validate(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFMergeChange(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFParseDateEx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ static FX_BOOL AFExtractNums(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
public:
JS_STATIC_GLOBAL_FUN(AFNumber_Format);
diff --git a/fpdfsdk/include/javascript/app.h b/fpdfsdk/include/javascript/app.h
index 1c95bf430d..50d55ef96f 100644
--- a/fpdfsdk/include/javascript/app.h
+++ b/fpdfsdk/include/javascript/app.h
@@ -108,41 +108,41 @@ public:
virtual ~app();
public:
- FX_BOOL activeDocs(OBJ_PROP_PARAMS);
- FX_BOOL calculate(OBJ_PROP_PARAMS);
- FX_BOOL formsVersion(OBJ_PROP_PARAMS);
- FX_BOOL fs(OBJ_PROP_PARAMS);
- FX_BOOL fullscreen(OBJ_PROP_PARAMS);
- FX_BOOL language(OBJ_PROP_PARAMS);
- FX_BOOL media(OBJ_PROP_PARAMS);
- FX_BOOL platform(OBJ_PROP_PARAMS);
- FX_BOOL runtimeHighlight(OBJ_PROP_PARAMS);
- FX_BOOL viewerType(OBJ_PROP_PARAMS);
- FX_BOOL viewerVariation(OBJ_PROP_PARAMS);
- FX_BOOL viewerVersion(OBJ_PROP_PARAMS);
-
-
- FX_BOOL alert(OBJ_METHOD_PARAMS);
- FX_BOOL beep(OBJ_METHOD_PARAMS);
- FX_BOOL browseForDoc(OBJ_METHOD_PARAMS);
- FX_BOOL clearInterval(OBJ_METHOD_PARAMS);
- FX_BOOL clearTimeOut(OBJ_METHOD_PARAMS);
- FX_BOOL execDialog(OBJ_METHOD_PARAMS);
- FX_BOOL execMenuItem(OBJ_METHOD_PARAMS);
- FX_BOOL findComponent(OBJ_METHOD_PARAMS);
- FX_BOOL goBack(OBJ_METHOD_PARAMS);
- FX_BOOL goForward(OBJ_METHOD_PARAMS);
- FX_BOOL launchURL(OBJ_METHOD_PARAMS);
- FX_BOOL mailMsg(OBJ_METHOD_PARAMS);
- FX_BOOL newFDF(OBJ_METHOD_PARAMS);
- FX_BOOL newDoc(OBJ_METHOD_PARAMS);
- FX_BOOL openDoc(OBJ_METHOD_PARAMS);
- FX_BOOL openFDF(OBJ_METHOD_PARAMS);
- FX_BOOL popUpMenuEx(OBJ_METHOD_PARAMS);
- FX_BOOL popUpMenu(OBJ_METHOD_PARAMS);
- FX_BOOL response(OBJ_METHOD_PARAMS);
- FX_BOOL setInterval(OBJ_METHOD_PARAMS);
- FX_BOOL setTimeOut(OBJ_METHOD_PARAMS);
+ FX_BOOL activeDocs(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL calculate(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL formsVersion(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL fs(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL fullscreen(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL language(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL media(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL platform(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL runtimeHighlight(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL viewerType(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL viewerVariation(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL viewerVersion(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+
+
+ FX_BOOL alert(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL beep(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL browseForDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL clearInterval(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL clearTimeOut(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL execDialog(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL execMenuItem(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL findComponent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL goBack(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL goForward(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL launchURL(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL mailMsg(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL newFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL newDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL openDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL openFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL popUpMenuEx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL popUpMenu(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL response(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL setInterval(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL setTimeOut(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
private:
// FX_DWORD AppGetTickCount();
diff --git a/fpdfsdk/include/javascript/color.h b/fpdfsdk/include/javascript/color.h
index d0aa72f8d3..02588acfba 100644
--- a/fpdfsdk/include/javascript/color.h
+++ b/fpdfsdk/include/javascript/color.h
@@ -13,21 +13,21 @@ public:
color(CJS_Object* pJSObject);
virtual ~color(void);
- FX_BOOL black(OBJ_PROP_PARAMS);
- FX_BOOL blue(OBJ_PROP_PARAMS);
- FX_BOOL cyan(OBJ_PROP_PARAMS);
- FX_BOOL dkGray(OBJ_PROP_PARAMS);
- FX_BOOL gray(OBJ_PROP_PARAMS);
- FX_BOOL green(OBJ_PROP_PARAMS);
- FX_BOOL ltGray(OBJ_PROP_PARAMS);
- FX_BOOL magenta(OBJ_PROP_PARAMS);
- FX_BOOL red(OBJ_PROP_PARAMS);
- FX_BOOL transparent(OBJ_PROP_PARAMS);
- FX_BOOL white(OBJ_PROP_PARAMS);
- FX_BOOL yellow(OBJ_PROP_PARAMS);
+ FX_BOOL black(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL blue(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL cyan(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL dkGray(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL gray(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL green(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL ltGray(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL magenta(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL red(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL transparent(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL white(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL yellow(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
- FX_BOOL convert(OBJ_METHOD_PARAMS);
- FX_BOOL equal(OBJ_METHOD_PARAMS);
+ FX_BOOL convert(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL equal(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
public:
static void ConvertPWLColorToArray(const CPWL_Color& color, CJS_Array& array);
diff --git a/fpdfsdk/include/javascript/console.h b/fpdfsdk/include/javascript/console.h
index 70d993b820..dc672ada94 100644
--- a/fpdfsdk/include/javascript/console.h
+++ b/fpdfsdk/include/javascript/console.h
@@ -14,10 +14,10 @@ public:
virtual ~console(void);
public:
- FX_BOOL clear(OBJ_METHOD_PARAMS);
- FX_BOOL hide(OBJ_METHOD_PARAMS);
- FX_BOOL println(OBJ_METHOD_PARAMS);
- FX_BOOL show(OBJ_METHOD_PARAMS);
+ FX_BOOL clear(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL hide(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL println(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL show(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
};
class CJS_Console : public CJS_Object
diff --git a/fpdfsdk/include/javascript/event.h b/fpdfsdk/include/javascript/event.h
index 040a9333a3..736962bae7 100644
--- a/fpdfsdk/include/javascript/event.h
+++ b/fpdfsdk/include/javascript/event.h
@@ -14,26 +14,26 @@ public:
virtual ~event(void);
public:
- FX_BOOL change(OBJ_PROP_PARAMS);
- FX_BOOL changeEx(OBJ_PROP_PARAMS);
- FX_BOOL commitKey(OBJ_PROP_PARAMS);
- FX_BOOL fieldFull(OBJ_PROP_PARAMS);
- FX_BOOL keyDown(OBJ_PROP_PARAMS);
- FX_BOOL modifier(OBJ_PROP_PARAMS);
- FX_BOOL name(OBJ_PROP_PARAMS);
- FX_BOOL rc(OBJ_PROP_PARAMS);
- FX_BOOL richChange(OBJ_PROP_PARAMS);
- FX_BOOL richChangeEx(OBJ_PROP_PARAMS);
- FX_BOOL richValue(OBJ_PROP_PARAMS);
- FX_BOOL selEnd(OBJ_PROP_PARAMS);
- FX_BOOL selStart(OBJ_PROP_PARAMS);
- FX_BOOL shift(OBJ_PROP_PARAMS);
- FX_BOOL source(OBJ_PROP_PARAMS);
- FX_BOOL target(OBJ_PROP_PARAMS);
- FX_BOOL targetName(OBJ_PROP_PARAMS);
- FX_BOOL type(OBJ_PROP_PARAMS);
- FX_BOOL value(OBJ_PROP_PARAMS);
- FX_BOOL willCommit(OBJ_PROP_PARAMS);
+ FX_BOOL change(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL changeEx(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL commitKey(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL fieldFull(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL keyDown(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL modifier(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL name(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL rc(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL richChange(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL richChangeEx(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL richValue(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL selEnd(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL selStart(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL shift(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL source(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL target(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL targetName(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL type(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL value(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
+ FX_BOOL willCommit(IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError);
};
diff --git a/fpdfsdk/include/javascript/global.h b/fpdfsdk/include/javascript/global.h
index f5867c50f8..bc6dab386d 100644
--- a/fpdfsdk/include/javascript/global.h
+++ b/fpdfsdk/include/javascript/global.h
@@ -41,7 +41,7 @@ public:
virtual ~global_alternate();
public:
- FX_BOOL setPersistent(OBJ_METHOD_PARAMS);
+ FX_BOOL setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
public:
FX_BOOL QueryProperty(FX_LPCWSTR propname);
diff --git a/fpdfsdk/include/javascript/report.h b/fpdfsdk/include/javascript/report.h
index fb5adf3994..f01d593984 100644
--- a/fpdfsdk/include/javascript/report.h
+++ b/fpdfsdk/include/javascript/report.h
@@ -14,8 +14,8 @@ public:
virtual ~Report();
public:
- FX_BOOL save(OBJ_METHOD_PARAMS);
- FX_BOOL writeText(OBJ_METHOD_PARAMS);
+ FX_BOOL save(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL writeText(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
};
class CJS_Report : public CJS_Object
diff --git a/fpdfsdk/include/javascript/util.h b/fpdfsdk/include/javascript/util.h
index 14857c97cb..b8de46c376 100644
--- a/fpdfsdk/include/javascript/util.h
+++ b/fpdfsdk/include/javascript/util.h
@@ -14,11 +14,11 @@ public:
virtual ~util(void);
public:
- FX_BOOL printd(OBJ_METHOD_PARAMS);
- FX_BOOL printf(OBJ_METHOD_PARAMS);
- FX_BOOL printx(OBJ_METHOD_PARAMS);
- FX_BOOL scand(OBJ_METHOD_PARAMS);
- FX_BOOL byteToChar(OBJ_METHOD_PARAMS);
+ FX_BOOL printd(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL printf(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL printx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL scand(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+ FX_BOOL byteToChar(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
public:
static void printd(const std::wstring &cFormat,CJS_Date Date,bool bXFAPicture, std::wstring &cPurpose);
diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h
index 3ea5054e17..e08196d6f1 100644
--- a/fpdfsdk/include/jsapi/fxjs_v8.h
+++ b/fpdfsdk/include/jsapi/fxjs_v8.h
@@ -45,14 +45,12 @@ class IFXJS_Runtime;
#ifndef JSCRIPT_ARGS
#define JSCRIPT_ARGS
-#define JS_PROPGET_ARGS v8::Local<v8::String> property,const v8::PropertyCallbackInfo<v8::Value>& info
-#define JS_PROPPUT_ARGS v8::Local<v8::String> property,v8::Local<v8::Value> value,const v8::PropertyCallbackInfo<void>& info
-#define JS_METHOD_ARGS const v8::FunctionCallbackInfo<v8::Value>& info
#define JS_CONSTRUCTOR_ARGS IFXJS_Context* cc, v8::Handle<v8::Object> obj, v8::Handle<v8::Object> global
#define JS_DESTRUCTOR_ARGS v8::Handle<v8::Object> obj
#define JS_PROPQUERY_ARGS v8::Local<v8::String> property,const v8::PropertyCallbackInfo<v8::Integer>& info
-#define JS_NAMED_PROPGET_ARGS JS_PROPGET_ARGS
+#define JS_NAMED_PROPGET_ARGS v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value>& info
+
#define JS_NAMED_PROPPUT_ARGS v8::Local<v8::String> property,v8::Local<v8::Value> value,const v8::PropertyCallbackInfo<v8::Value>& info
#define JS_PROPDEL_ARGS v8::Local<v8::String> property,const v8::PropertyCallbackInfo<v8::Boolean>& info