diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-05-17 13:53:52 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-17 13:53:52 +0000 |
| commit | dc5d88bcebbeeb696b405464e901add55d1efaf7 (patch) | |
| tree | 54bc913015ea4d08b9fe46997f25a3153cbc70d7 /fxjs/cfxjs_engine.h | |
| parent | db3c6cefceddf25c25f1205d7b633f09e873bf98 (diff) | |
| download | pdfium-dc5d88bcebbeeb696b405464e901add55d1efaf7.tar.xz | |
Convert JS execute methods to return Optional<IJS_Runtime::JS_Error>
This CL changes several of the JS execution methods to to return an
Optional<IJS_Runtime::JS_Error> 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 <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs/cfxjs_engine.h')
| -rw-r--r-- | fxjs/cfxjs_engine.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fxjs/cfxjs_engine.h b/fxjs/cfxjs_engine.h index 4f903bd96e..d1fb70cc28 100644 --- a/fxjs/cfxjs_engine.h +++ b/fxjs/cfxjs_engine.h @@ -21,6 +21,7 @@ #include "core/fxcrt/fx_string.h" #include "fxjs/cfx_v8.h" +#include "fxjs/ijs_runtime.h" #include "v8/include/v8-util.h" #include "v8/include/v8.h" @@ -43,12 +44,6 @@ enum FXJSOBJTYPE { FXJSOBJTYPE_GLOBAL, // The global object itself (may only appear once). }; -struct FXJSErr { - const wchar_t* message; - const wchar_t* srcline; - unsigned linnum; -}; - class FXJS_PerIsolateData { public: ~FXJS_PerIsolateData(); @@ -128,7 +123,7 @@ class CFXJS_Engine : public CFX_V8 { void ReleaseEngine(); // Called after FXJS_InitializeEngine call made. - int Execute(const WideString& script, FXJSErr* perror); + Optional<IJS_Runtime::JS_Error> Execute(const WideString& script); v8::Local<v8::Object> GetThisObj(); v8::Local<v8::Object> NewFXJSBoundObject(int nObjDefnID, |