From 94fc2af0c9a800f39e4dbcac859f1ad490f7d725 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 8 Jan 2018 15:12:10 -0500 Subject: Move CXFA_WidgetAcc from CJX_Object to CXFA_Object This CL change the CJX code to not store the pointer to the CXFA_WidgetAcc. If needed the CJX object gets the Acc from the Node itself. Change-Id: I5a5a500b8fbc1749d362346d72678acd5250d112 Reviewed-on: https://pdfium-review.googlesource.com/22411 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- fxjs/xfa/cjx_template.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'fxjs/xfa/cjx_template.cpp') diff --git a/fxjs/xfa/cjx_template.cpp b/fxjs/xfa/cjx_template.cpp index 9e72257cf3..816c9d487b 100644 --- a/fxjs/xfa/cjx_template.cpp +++ b/fxjs/xfa/cjx_template.cpp @@ -50,7 +50,8 @@ CJS_Return CJX_Template::execInitialize( const std::vector>& params) { if (!params.empty()) return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(runtime->NewBoolean(!!GetWidgetAcc())); + return CJS_Return( + runtime->NewBoolean(!!ToNode(GetXFAObject())->GetWidgetAcc())); } CJS_Return CJX_Template::recalculate( @@ -66,7 +67,8 @@ CJS_Return CJX_Template::execCalculate( const std::vector>& params) { if (!params.empty()) return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(runtime->NewBoolean(!!GetWidgetAcc())); + return CJS_Return( + runtime->NewBoolean(!!ToNode(GetXFAObject())->GetWidgetAcc())); } CJS_Return CJX_Template::execValidate( @@ -74,5 +76,6 @@ CJS_Return CJX_Template::execValidate( const std::vector>& params) { if (!params.empty()) return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - return CJS_Return(runtime->NewBoolean(!!GetWidgetAcc())); + return CJS_Return( + runtime->NewBoolean(!!ToNode(GetXFAObject())->GetWidgetAcc())); } -- cgit v1.2.3