summaryrefslogtreecommitdiff
path: root/fxjs/xfa/cjx_exclgroup.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-08-17 16:44:50 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-08-17 16:44:50 +0000
commit20736f7f5884cf1e2827543c92b6e47f8282aeaf (patch)
tree9a0f3cbd9262d1676f70ab02c3fa5b4e0acaa03a /fxjs/xfa/cjx_exclgroup.cpp
parent21068062a038db72b5ee40512fe638acbdd17c3d (diff)
downloadpdfium-20736f7f5884cf1e2827543c92b6e47f8282aeaf.tar.xz
Introduce safer CJS_Return::Success() and Failure().
Avoid the possibility of ever re-introducing the issue noticed last week. Remove some redundant JSGetStringFromID() calls. Change-Id: I56687c2191bd72e378f747083f34080e50cbe490 Reviewed-on: https://pdfium-review.googlesource.com/40490 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs/xfa/cjx_exclgroup.cpp')
-rw-r--r--fxjs/xfa/cjx_exclgroup.cpp29
1 files changed, 15 insertions, 14 deletions
diff --git a/fxjs/xfa/cjx_exclgroup.cpp b/fxjs/xfa/cjx_exclgroup.cpp
index 0de0ef00fd..3a7f9dd2fb 100644
--- a/fxjs/xfa/cjx_exclgroup.cpp
+++ b/fxjs/xfa/cjx_exclgroup.cpp
@@ -34,63 +34,63 @@ CJS_Return CJX_ExclGroup::execEvent(
CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
- return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
+ return CJS_Return::Failure(JSMessage::kParamError);
execSingleEventByName(runtime->ToWideString(params[0]).AsStringView(),
XFA_Element::ExclGroup);
- return CJS_Return();
+ return CJS_Return::Success();
}
CJS_Return CJX_ExclGroup::execInitialize(
CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
- return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
+ return CJS_Return::Failure(JSMessage::kParamError);
CXFA_FFNotify* pNotify = GetDocument()->GetNotify();
if (pNotify)
pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Initialize, false,
true);
- return CJS_Return();
+ return CJS_Return::Success();
}
CJS_Return CJX_ExclGroup::execCalculate(
CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
- return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
+ return CJS_Return::Failure(JSMessage::kParamError);
CXFA_FFNotify* pNotify = GetDocument()->GetNotify();
if (pNotify)
pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate, false,
true);
- return CJS_Return();
+ return CJS_Return::Success();
}
CJS_Return CJX_ExclGroup::execValidate(
CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
- return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
+ return CJS_Return::Failure(JSMessage::kParamError);
CXFA_FFNotify* notify = GetDocument()->GetNotify();
if (!notify)
- return CJS_Return(runtime->NewBoolean(false));
+ return CJS_Return::Success(runtime->NewBoolean(false));
int32_t iRet = notify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Validate,
false, true);
- return CJS_Return(runtime->NewBoolean(iRet != XFA_EVENTERROR_Error));
+ return CJS_Return::Success(runtime->NewBoolean(iRet != XFA_EVENTERROR_Error));
}
CJS_Return CJX_ExclGroup::selectedMember(
CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
- return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
+ return CJS_Return::Failure(JSMessage::kParamError);
CXFA_Node* node = GetXFANode();
if (!node->IsWidgetReady())
- return CJS_Return(runtime->NewNull());
+ return CJS_Return::Success(runtime->NewNull());
CXFA_Node* pReturnNode = nullptr;
if (params.empty()) {
@@ -100,14 +100,15 @@ CJS_Return CJX_ExclGroup::selectedMember(
runtime->ToWideString(params[0]).AsStringView(), true);
}
if (!pReturnNode)
- return CJS_Return(runtime->NewNull());
+ return CJS_Return::Success(runtime->NewNull());
CFXJSE_Value* value =
GetDocument()->GetScriptContext()->GetJSValueFromMap(pReturnNode);
if (!value)
- return CJS_Return(runtime->NewNull());
+ return CJS_Return::Success(runtime->NewNull());
- return CJS_Return(value->DirectGetValue().Get(runtime->GetIsolate()));
+ return CJS_Return::Success(
+ value->DirectGetValue().Get(runtime->GetIsolate()));
}
void CJX_ExclGroup::defaultValue(CFXJSE_Value* pValue,