From 3a6d058740a9908a06efb9e9362df01acdee6ff8 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 17 Aug 2018 19:28:52 +0000 Subject: Rename CJS_Return to CJS_Result. "Return" is a verb, and "return" is a reserved-word at that, so avoid using it as part of a class name. Fully mechanical change apart from rename. Change-Id: I120e453e8ba001c4ab74a39e2da6aa6eb590835f Reviewed-on: https://pdfium-review.googlesource.com/40532 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- fxjs/xfa/cjx_exclgroup.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'fxjs/xfa/cjx_exclgroup.cpp') diff --git a/fxjs/xfa/cjx_exclgroup.cpp b/fxjs/xfa/cjx_exclgroup.cpp index 3a7f9dd2fb..a5ddc940f1 100644 --- a/fxjs/xfa/cjx_exclgroup.cpp +++ b/fxjs/xfa/cjx_exclgroup.cpp @@ -30,67 +30,67 @@ CJX_ExclGroup::CJX_ExclGroup(CXFA_ExclGroup* group) : CJX_Node(group) { CJX_ExclGroup::~CJX_ExclGroup() {} -CJS_Return CJX_ExclGroup::execEvent( +CJS_Result CJX_ExclGroup::execEvent( CFX_V8* runtime, const std::vector>& params) { if (params.size() != 1) - return CJS_Return::Failure(JSMessage::kParamError); + return CJS_Result::Failure(JSMessage::kParamError); execSingleEventByName(runtime->ToWideString(params[0]).AsStringView(), XFA_Element::ExclGroup); - return CJS_Return::Success(); + return CJS_Result::Success(); } -CJS_Return CJX_ExclGroup::execInitialize( +CJS_Result CJX_ExclGroup::execInitialize( CFX_V8* runtime, const std::vector>& params) { if (!params.empty()) - return CJS_Return::Failure(JSMessage::kParamError); + return CJS_Result::Failure(JSMessage::kParamError); CXFA_FFNotify* pNotify = GetDocument()->GetNotify(); if (pNotify) pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Initialize, false, true); - return CJS_Return::Success(); + return CJS_Result::Success(); } -CJS_Return CJX_ExclGroup::execCalculate( +CJS_Result CJX_ExclGroup::execCalculate( CFX_V8* runtime, const std::vector>& params) { if (!params.empty()) - return CJS_Return::Failure(JSMessage::kParamError); + return CJS_Result::Failure(JSMessage::kParamError); CXFA_FFNotify* pNotify = GetDocument()->GetNotify(); if (pNotify) pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate, false, true); - return CJS_Return::Success(); + return CJS_Result::Success(); } -CJS_Return CJX_ExclGroup::execValidate( +CJS_Result CJX_ExclGroup::execValidate( CFX_V8* runtime, const std::vector>& params) { if (!params.empty()) - return CJS_Return::Failure(JSMessage::kParamError); + return CJS_Result::Failure(JSMessage::kParamError); CXFA_FFNotify* notify = GetDocument()->GetNotify(); if (!notify) - return CJS_Return::Success(runtime->NewBoolean(false)); + return CJS_Result::Success(runtime->NewBoolean(false)); int32_t iRet = notify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate, false, true); - return CJS_Return::Success(runtime->NewBoolean(iRet != XFA_EVENTERROR_Error)); + return CJS_Result::Success(runtime->NewBoolean(iRet != XFA_EVENTERROR_Error)); } -CJS_Return CJX_ExclGroup::selectedMember( +CJS_Result CJX_ExclGroup::selectedMember( CFX_V8* runtime, const std::vector>& params) { if (!params.empty()) - return CJS_Return::Failure(JSMessage::kParamError); + return CJS_Result::Failure(JSMessage::kParamError); CXFA_Node* node = GetXFANode(); if (!node->IsWidgetReady()) - return CJS_Return::Success(runtime->NewNull()); + return CJS_Result::Success(runtime->NewNull()); CXFA_Node* pReturnNode = nullptr; if (params.empty()) { @@ -100,14 +100,14 @@ CJS_Return CJX_ExclGroup::selectedMember( runtime->ToWideString(params[0]).AsStringView(), true); } if (!pReturnNode) - return CJS_Return::Success(runtime->NewNull()); + return CJS_Result::Success(runtime->NewNull()); CFXJSE_Value* value = GetDocument()->GetScriptContext()->GetJSValueFromMap(pReturnNode); if (!value) - return CJS_Return::Success(runtime->NewNull()); + return CJS_Result::Success(runtime->NewNull()); - return CJS_Return::Success( + return CJS_Result::Success( value->DirectGetValue().Get(runtime->GetIsolate())); } -- cgit v1.2.3