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>

1 files changed, 9 insertions, 10 deletions

diff --git a/fxjs/xfa/cjx_eventpseudomodel.cpp b/fxjs/xfa/cjx_eventpseudomodel.cpp
index a1457432f9..3adf1e39a8 100644
--- a/fxjs/xfa/cjx_eventpseudomodel.cpp
+++ b/fxjs/xfa/cjx_eventpseudomodel.cpp
@@ -174,22 +174,22 @@ CJS_Return CJX_EventPseudoModel::emit(
     const std::vector<v8::Local<v8::Value>>& params) {
   CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext();
   if (!pScriptContext)
-    return CJS_Return();
+    return CJS_Return::Success();
 
   CXFA_EventParam* pEventParam = pScriptContext->GetEventParam();
   if (!pEventParam)
-    return CJS_Return();
+    return CJS_Return::Success();
 
   CXFA_FFNotify* pNotify = GetDocument()->GetNotify();
   if (!pNotify)
-    return CJS_Return();
+    return CJS_Return::Success();
 
   CXFA_FFWidgetHandler* pWidgetHandler = pNotify->GetWidgetHandler();
   if (!pWidgetHandler)
-    return CJS_Return();
+    return CJS_Return::Success();
 
   pWidgetHandler->ProcessEvent(pEventParam->m_pTarget.Get(), pEventParam);
-  return CJS_Return();
+  return CJS_Return::Success();
 }
 
 CJS_Return CJX_EventPseudoModel::reset(
@@ -197,14 +197,13 @@ CJS_Return CJX_EventPseudoModel::reset(
     const std::vector<v8::Local<v8::Value>>& params) {
   CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext();
   if (!pScriptContext)
-    return CJS_Return();
+    return CJS_Return::Success();
 
   CXFA_EventParam* pEventParam = pScriptContext->GetEventParam();
-  if (!pEventParam)
-    return CJS_Return();
+  if (pEventParam)
+    pEventParam->Reset();
 
-  pEventParam->Reset();
-  return CJS_Return();
+  return CJS_Return::Success();
 }
 
 void CJX_EventPseudoModel::Property(CFXJSE_Value* pValue,