diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-06-08 18:23:05 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-08 18:23:05 +0000 |
| commit | 1699982f45d01cb18585eba80cce5326a63d3b67 (patch) | |
| tree | 537d81d989632bab75fda37f5b587e1309e60d5d /fxjs/xfa/cjx_form.cpp | |
| parent | f29479d47156d180c0b71f6c98aa4de37c2a7ee2 (diff) | |
| download | pdfium-1699982f45d01cb18585eba80cce5326a63d3b67.tar.xz | |
Ensure CJS_Return() with error always includes a message.
Change the signature of the constructors to make it impossible to
do this otherwise.
Change-Id: I14e88d98a1128f2d599459ce9337cd6d079469fe
Reviewed-on: https://pdfium-review.googlesource.com/34531
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs/xfa/cjx_form.cpp')
| -rw-r--r-- | fxjs/xfa/cjx_form.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fxjs/xfa/cjx_form.cpp b/fxjs/xfa/cjx_form.cpp index fa244b3af6..d1d50ad8f3 100644 --- a/fxjs/xfa/cjx_form.cpp +++ b/fxjs/xfa/cjx_form.cpp @@ -59,7 +59,7 @@ CJS_Return CJX_Form::remerge(CFX_V8* runtime, return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); GetDocument()->DoDataRemerge(true); - return CJS_Return(true); + return CJS_Return(); } CJS_Return CJX_Form::execInitialize( @@ -72,7 +72,7 @@ CJS_Return CJX_Form::execInitialize( if (pNotify) pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Initialize, false, true); - return CJS_Return(true); + return CJS_Return(); } CJS_Return CJX_Form::recalculate( @@ -82,19 +82,19 @@ CJS_Return CJX_Form::recalculate( GetDocument()->GetScriptContext()->GetEventParam(); if (pEventParam->m_eType == XFA_EVENT_Calculate || pEventParam->m_eType == XFA_EVENT_InitCalculate) { - return CJS_Return(true); + return CJS_Return(); } if (params.size() != 1) return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); CXFA_FFNotify* pNotify = GetDocument()->GetNotify(); if (!pNotify || runtime->ToInt32(params[0]) != 0) - return CJS_Return(true); + return CJS_Return(); 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); + return CJS_Return(); } CJS_Return CJX_Form::execCalculate( @@ -107,7 +107,7 @@ CJS_Return CJX_Form::execCalculate( if (pNotify) pNotify->ExecEventByDeepFirst(GetXFANode(), XFA_EVENT_Calculate, false, true); - return CJS_Return(true); + return CJS_Return(); } CJS_Return CJX_Form::execValidate( |