From 4b172c4934ddda46e06b1c4dc7554e96e1a2f54a Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 23 Oct 2017 11:22:31 -0400 Subject: Cleaning up JS macros This Cl moves JS_Defines macros with only one usage to be inline. Moves macros to where they're used and expands as needed. Change-Id: I7296aa0b7a815ef8f2a80dd813e7466056fe37af Reviewed-on: https://pdfium-review.googlesource.com/16510 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- fpdfsdk/javascript/PublicMethods.h | 69 +++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 24 deletions(-) (limited to 'fpdfsdk/javascript/PublicMethods.h') diff --git a/fpdfsdk/javascript/PublicMethods.h b/fpdfsdk/javascript/PublicMethods.h index abce08b8a6..1d30832fb7 100644 --- a/fpdfsdk/javascript/PublicMethods.h +++ b/fpdfsdk/javascript/PublicMethods.h @@ -107,31 +107,52 @@ class CJS_PublicMethods : public CJS_Object { CJS_Value& vRet, WideString& sError); - JS_STATIC_GLOBAL_FUN(AFNumber_Format); - JS_STATIC_GLOBAL_FUN(AFNumber_Keystroke); - JS_STATIC_GLOBAL_FUN(AFPercent_Format); - JS_STATIC_GLOBAL_FUN(AFPercent_Keystroke); - JS_STATIC_GLOBAL_FUN(AFDate_FormatEx); - JS_STATIC_GLOBAL_FUN(AFDate_KeystrokeEx); - JS_STATIC_GLOBAL_FUN(AFDate_Format); - JS_STATIC_GLOBAL_FUN(AFDate_Keystroke); - JS_STATIC_GLOBAL_FUN(AFTime_FormatEx); - JS_STATIC_GLOBAL_FUN(AFTime_KeystrokeEx); - JS_STATIC_GLOBAL_FUN(AFTime_Format); - JS_STATIC_GLOBAL_FUN(AFTime_Keystroke); - JS_STATIC_GLOBAL_FUN(AFSpecial_Format); - JS_STATIC_GLOBAL_FUN(AFSpecial_Keystroke); - JS_STATIC_GLOBAL_FUN(AFSpecial_KeystrokeEx); - JS_STATIC_GLOBAL_FUN(AFSimple); - JS_STATIC_GLOBAL_FUN(AFMakeNumber); - JS_STATIC_GLOBAL_FUN(AFSimple_Calculate); - JS_STATIC_GLOBAL_FUN(AFRange_Validate); - JS_STATIC_GLOBAL_FUN(AFMergeChange); - JS_STATIC_GLOBAL_FUN(AFParseDateEx); - JS_STATIC_GLOBAL_FUN(AFExtractNums); - - JS_STATIC_DECLARE_GLOBAL_FUN(); + static void AFNumber_Format_static( + const v8::FunctionCallbackInfo& info); + static void AFNumber_Keystroke_static( + const v8::FunctionCallbackInfo& info); + static void AFPercent_Format_static( + const v8::FunctionCallbackInfo& info); + static void AFPercent_Keystroke_static( + const v8::FunctionCallbackInfo& info); + static void AFDate_FormatEx_static( + const v8::FunctionCallbackInfo& info); + static void AFDate_KeystrokeEx_static( + const v8::FunctionCallbackInfo& info); + static void AFDate_Format_static( + const v8::FunctionCallbackInfo& info); + static void AFDate_Keystroke_static( + const v8::FunctionCallbackInfo& info); + static void AFTime_FormatEx_static( + const v8::FunctionCallbackInfo& info); + static void AFTime_KeystrokeEx_static( + const v8::FunctionCallbackInfo& info); + static void AFTime_Format_static( + const v8::FunctionCallbackInfo& info); + static void AFTime_Keystroke_static( + const v8::FunctionCallbackInfo& info); + static void AFSpecial_Format_static( + const v8::FunctionCallbackInfo& info); + static void AFSpecial_Keystroke_static( + const v8::FunctionCallbackInfo& info); + static void AFSpecial_KeystrokeEx_static( + const v8::FunctionCallbackInfo& info); + static void AFSimple_static(const v8::FunctionCallbackInfo& info); + static void AFMakeNumber_static( + const v8::FunctionCallbackInfo& info); + static void AFSimple_Calculate_static( + const v8::FunctionCallbackInfo& info); + static void AFRange_Validate_static( + const v8::FunctionCallbackInfo& info); + static void AFMergeChange_static( + const v8::FunctionCallbackInfo& info); + static void AFParseDateEx_static( + const v8::FunctionCallbackInfo& info); + static void AFExtractNums_static( + const v8::FunctionCallbackInfo& info); + static JSMethodSpec GlobalFunctionSpecs[]; + static void DefineJSObjects(CFXJS_Engine* pEngine); static int ParseStringInteger(const WideString& string, size_t nStart, size_t& nSkip, -- cgit v1.2.3