tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

clearify code

Browse Source
This commit is contained in:
王劲鹏 2021-03-31 17:56:47 +08:00 committed by osborn
parent 2684a78493
commit 18cef64141
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doric-Qt/doric/engine/v8/V8Executor.cpp
View File

@ -35,8 +35,11 @@ V8Executor::~V8Executor() {
} }
QString V8Executor::loadJS(QString script, QString source) { QString V8Executor::loadJS(QString script, QString source) {
v8::Isolate *isolate = m_isolate;
std::string exception; std::string exception;
v8::HandleScope scope(m_isolate);
v8::HandleScope scope(isolate);
v8::Local<v8::Value> ret = innerExec(script.toUtf8().constData(), v8::Local<v8::Value> ret = innerExec(script.toUtf8().constData(),
source.toUtf8().constData(), &exception); source.toUtf8().constData(), &exception);
std::string result = ToString(ret); std::string result = ToString(ret);
@ -45,15 +48,21 @@ QString V8Executor::loadJS(QString script, QString source) {
} }
void V8Executor::injectGlobalJSObject(QString name, QObject *target) { void V8Executor::injectGlobalJSObject(QString name, QObject *target) {
v8::HandleScope handleScope(v8::Isolate::GetCurrent()); v8::Isolate *isolate = m_isolate;
v8::HandleScope handleScope(isolate);
v8::Local<v8::Value> local = ObjectToJS(target); v8::Local<v8::Value> local = ObjectToJS(target);
injectObject(name.toUtf8().constData(), local);
}
void V8Executor::injectObject(const char *string, v8::Local<v8::Value> local) {
v8::Isolate *isolate = m_isolate; v8::Isolate *isolate = m_isolate;
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
v8::Local<v8::Context> context = isolate->GetEnteredOrMicrotaskContext(); v8::Local<v8::Context> context = isolate->GetEnteredOrMicrotaskContext();
v8::Local<v8::Object> object = context->Global(); v8::Local<v8::Object> object = context->Global();
v8::Maybe<bool> result = v8::Maybe<bool> result = object->Set(context, NewV8String(string), local);
object->Set(context, NewV8String(name.toUtf8().constData()), local);
result.ToChecked(); result.ToChecked();
} }
@ -61,6 +70,7 @@ v8::Local<v8::Value> V8Executor::innerExec(const char *script,
const char *source, const char *source,
std::string *exception_str) { std::string *exception_str) {
v8::Isolate *isolate = m_isolate; v8::Isolate *isolate = m_isolate;
v8::EscapableHandleScope handle_scope(isolate); v8::EscapableHandleScope handle_scope(isolate);
v8::Local<v8::Value> result = Undefined(isolate); v8::Local<v8::Value> result = Undefined(isolate);
v8::Local<v8::Context> context = isolate->GetEnteredOrMicrotaskContext(); v8::Local<v8::Context> context = isolate->GetEnteredOrMicrotaskContext();

2
doric-Qt/doric/engine/v8/V8Executor.h
View File

@ -16,6 +16,8 @@ private:
v8::Isolate::Scope *m_isolate_scope; v8::Isolate::Scope *m_isolate_scope;
v8::Global<v8::Context> *m_global_context; v8::Global<v8::Context> *m_global_context;
void injectObject(const char *string, v8::Local<v8::Value> local);
v8::Local<v8::Value> innerExec(const char *script, const char *source, v8::Local<v8::Value> innerExec(const char *script, const char *source,
std::string *exception_str); std::string *exception_str);