From bc948ce8d553422ef2a6285356e09e0261702583 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 22 Jan 2018 21:28:58 +0000 Subject: Remove CXFA_WidgetAcc from CXFA_FFNotify This CL updates CXFA_FFNotify to use CXFA_Node instead of CXFA_WidgetAcc in its methods. Change-Id: I5036767f439ba0794a7b2b9df1898aad8390f987 Reviewed-on: https://pdfium-review.googlesource.com/23411 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- fxjs/xfa/cjx_form.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'fxjs/xfa/cjx_form.cpp') diff --git a/fxjs/xfa/cjx_form.cpp b/fxjs/xfa/cjx_form.cpp index 54f06fe966..6576df88d2 100644 --- a/fxjs/xfa/cjx_form.cpp +++ b/fxjs/xfa/cjx_form.cpp @@ -69,7 +69,8 @@ CJS_Return CJX_Form::execInitialize( CXFA_FFNotify* pNotify = GetDocument()->GetNotify(); if (pNotify) - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Initialize); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Initialize, false, + true); return CJS_Return(true); } @@ -89,9 +90,9 @@ CJS_Return CJX_Form::recalculate( if (!pNotify || runtime->ToInt32(params[0]) != 0) return CJS_Return(true); - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate); - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate); - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Ready, true); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate, false, true); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate, false, true); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Ready, true, true); return CJS_Return(true); } @@ -103,7 +104,8 @@ CJS_Return CJX_Form::execCalculate( CXFA_FFNotify* pNotify = GetDocument()->GetNotify(); if (pNotify) - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate); + pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate, false, + true); return CJS_Return(true); } @@ -117,7 +119,7 @@ CJS_Return CJX_Form::execValidate( if (!pNotify) return CJS_Return(runtime->NewBoolean(false)); - int32_t iRet = - pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate); + int32_t iRet = pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate, + false, true); return CJS_Return(runtime->NewBoolean(iRet != XFA_EVENTERROR_Error)); } -- cgit v1.2.3