From dc5d88bcebbeeb696b405464e901add55d1efaf7 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 17 May 2018 13:53:52 +0000 Subject: Convert JS execute methods to return Optional This CL changes several of the JS execution methods to to return an Optional instead of a bool with a WideString out param. The IJS_Runtime::JS_Error will contain the line, column and exception message if an error occurs during execution. Change-Id: I37785ae6cd133a4c94ad8d25289473600b8a5d19 Reviewed-on: https://pdfium-review.googlesource.com/32614 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fxjs/cjs_runtime.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'fxjs/cjs_runtime.cpp') diff --git a/fxjs/cjs_runtime.cpp b/fxjs/cjs_runtime.cpp index f6e7b2d18a..b47c595350 100644 --- a/fxjs/cjs_runtime.cpp +++ b/fxjs/cjs_runtime.cpp @@ -190,14 +190,9 @@ CPDFSDK_FormFillEnvironment* CJS_Runtime::GetFormFillEnv() const { return m_pFormFillEnv.Get(); } -int CJS_Runtime::ExecuteScript(const WideString& script, WideString* info) { - FXJSErr error = {}; - int nRet = Execute(script, &error); - if (nRet < 0) { - *info = WideString::Format(L"[ Line: %05d { %ls } ] : %s", error.linnum - 1, - error.srcline, error.message); - } - return nRet; +Optional CJS_Runtime::ExecuteScript( + const WideString& script) { + return Execute(script); } bool CJS_Runtime::AddEventToSet(const FieldEvent& event) { -- cgit v1.2.3