From cb22f9ad9265f40b1104ed2b09488ccc6ec9e5aa Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 11 Dec 2017 22:01:08 +0000 Subject: [xfa] Refactor CJX method signatures. This CL changes the CJX methods from void (*)(CFXJSE_Arguments*) to CJS_Return (*)(CJS_V8* runtime, const std::vector>& params) which is closer to how CJS works in practice. Change-Id: I3a3129268acfe4262dfeb04179919ed19f6c24e1 Reviewed-on: https://pdfium-review.googlesource.com/20491 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fxjs/cjx_layoutpseudomodel.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'fxjs/cjx_layoutpseudomodel.h') diff --git a/fxjs/cjx_layoutpseudomodel.h b/fxjs/cjx_layoutpseudomodel.h index 9eba2ac85f..e465d42f8e 100644 --- a/fxjs/cjx_layoutpseudomodel.h +++ b/fxjs/cjx_layoutpseudomodel.h @@ -19,7 +19,6 @@ enum XFA_LAYOUTMODEL_HWXY { XFA_LAYOUTMODEL_Y }; -class CFXJSE_Arguments; class CFXJSE_Value; class CScript_LayoutPseudoModel; class CXFA_LayoutProcessor; @@ -53,13 +52,17 @@ class CJX_LayoutPseudoModel : public CJX_Object { JS_METHOD(y, CJX_LayoutPseudoModel); private: - void NumberedPageCount(CFXJSE_Arguments* pArguments, bool bNumbered); - void HWXY(CFXJSE_Arguments* pArguments, XFA_LAYOUTMODEL_HWXY layoutModel); + CJS_Return NumberedPageCount(CJS_V8* runtime, bool bNumbered); + CJS_Return HWXY(CJS_V8* runtime, + const std::vector>& params, + XFA_LAYOUTMODEL_HWXY layoutModel); std::vector GetObjArray(CXFA_LayoutProcessor* pDocLayout, int32_t iPageNo, const WideString& wsType, bool bOnPageArea); - void PageInternals(CFXJSE_Arguments* pArguments, bool bAbsPage); + CJS_Return PageInternals(CJS_V8* runtime, + const std::vector>& params, + bool bAbsPage); static const CJX_MethodSpec MethodSpecs[]; }; -- cgit v1.2.3