summaryrefslogtreecommitdiff
path: root/fxjs/xfa/cjx_form.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-08-17 19:28:52 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-08-17 19:28:52 +0000
commit3a6d058740a9908a06efb9e9362df01acdee6ff8 (patch)
tree9bc645b0cb3442749458fc63e2feb04c0cb813ef /fxjs/xfa/cjx_form.cpp
parent0a2328e0eff7a11aa49b7da8f013e658153a7b1a (diff)
downloadpdfium-3a6d058740a9908a06efb9e9362df01acdee6ff8.tar.xz
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 <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs/xfa/cjx_form.cpp')
-rw-r--r--fxjs/xfa/cjx_form.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/fxjs/xfa/cjx_form.cpp b/fxjs/xfa/cjx_form.cpp
index 3bbdb72bfb..a59edd01ef 100644
--- a/fxjs/xfa/cjx_form.cpp
+++ b/fxjs/xfa/cjx_form.cpp
@@ -31,16 +31,16 @@ CJX_Form::CJX_Form(CXFA_Form* form) : CJX_Model(form) {
CJX_Form::~CJX_Form() {}
-CJS_Return CJX_Form::formNodes(
+CJS_Result CJX_Form::formNodes(
CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
- return CJS_Return::Failure(JSMessage::kParamError);
+ return CJS_Result::Failure(JSMessage::kParamError);
CXFA_Node* pDataNode =
ToNode(static_cast<CFXJSE_Engine*>(runtime)->ToXFAObject(params[0]));
if (!pDataNode)
- return CJS_Return::Failure(JSMessage::kValueError);
+ return CJS_Result::Failure(JSMessage::kValueError);
std::vector<CXFA_Node*> formItems;
CXFA_ArrayNodeList* pFormNodes = new CXFA_ArrayNodeList(GetDocument());
@@ -49,79 +49,79 @@ CJS_Return CJX_Form::formNodes(
CFXJSE_Value* value =
GetDocument()->GetScriptContext()->GetJSValueFromMap(pFormNodes);
if (!value)
- return CJS_Return::Success(runtime->NewNull());
- return CJS_Return::Success(
+ return CJS_Result::Success(runtime->NewNull());
+ return CJS_Result::Success(
value->DirectGetValue().Get(runtime->GetIsolate()));
}
-CJS_Return CJX_Form::remerge(CFX_V8* runtime,
+CJS_Result CJX_Form::remerge(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
- return CJS_Return::Failure(JSMessage::kParamError);
+ return CJS_Result::Failure(JSMessage::kParamError);
GetDocument()->DoDataRemerge(true);
- return CJS_Return::Success();
+ return CJS_Result::Success();
}
-CJS_Return CJX_Form::execInitialize(
+CJS_Result CJX_Form::execInitialize(
CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& 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_Form::recalculate(
+CJS_Result CJX_Form::recalculate(
CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
CXFA_EventParam* pEventParam =
GetDocument()->GetScriptContext()->GetEventParam();
if (pEventParam->m_eType == XFA_EVENT_Calculate ||
pEventParam->m_eType == XFA_EVENT_InitCalculate) {
- return CJS_Return::Success();
+ return CJS_Result::Success();
}
if (params.size() != 1)
- return CJS_Return::Failure(JSMessage::kParamError);
+ return CJS_Result::Failure(JSMessage::kParamError);
CXFA_FFNotify* pNotify = GetDocument()->GetNotify();
if (!pNotify || runtime->ToInt32(params[0]) != 0)
- return CJS_Return::Success();
+ return CJS_Result::Success();
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::Success();
+ return CJS_Result::Success();
}
-CJS_Return CJX_Form::execCalculate(
+CJS_Result CJX_Form::execCalculate(
CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& 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_Form::execValidate(
+CJS_Result CJX_Form::execValidate(
CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 0)
- return CJS_Return::Failure(JSMessage::kParamError);
+ return CJS_Result::Failure(JSMessage::kParamError);
CXFA_FFNotify* pNotify = GetDocument()->GetNotify();
if (!pNotify)
- return CJS_Return::Success(runtime->NewBoolean(false));
+ return CJS_Result::Success(runtime->NewBoolean(false));
int32_t iRet = pNotify->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));
}