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
diff --git a/fpdfsdk/include/javascript/PublicMethods.h b/fpdfsdk/include/javascript/PublicMethods.h
index 8d4e683..40b0ce9 100644
--- a/fpdfsdk/include/javascript/PublicMethods.h
+++ b/fpdfsdk/include/javascript/PublicMethods.h
@@ -14,28 +14,28 @@
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);