summaryrefslogtreecommitdiff
path: root/fxjs/cfxjs_engine.h
diff options
context:
space:
mode:
Diffstat (limited to 'fxjs/cfxjs_engine.h')
-rw-r--r--fxjs/cfxjs_engine.h9
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,