Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_34031325
engine
提交
613abf2d
E
engine
项目概览
qq_34031325
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
613abf2d
编写于
5月 11, 2018
作者:
C
Chinmay Garde
提交者:
GitHub
5月 11, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Terminate the engine immediately if there are isolate launch errors. (#5244)
上级
b34ab183
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
6 deletion
+22
-6
content_handler/engine.cc
content_handler/engine.cc
+19
-4
shell/common/engine.cc
shell/common/engine.cc
+3
-2
未找到文件。
content_handler/engine.cc
浏览文件 @
613abf2d
...
...
@@ -204,12 +204,27 @@ Engine::Engine(Delegate& delegate,
auto
run_configuration
=
shell
::
RunConfiguration
::
InferFromSettings
(
settings_
);
auto
on_run_failure
=
[
weak
=
weak_factory_
.
GetWeakPtr
(),
//
runner
=
fsl
::
MessageLoop
::
GetCurrent
()
->
task_runner
()
//
]()
{
// The engine could have been killed by the caller right after the
// constructor was called but before it could run on the UI thread.
if
(
weak
)
{
weak
->
Terminate
();
}
};
shell_
->
GetTaskRunners
().
GetUITaskRunner
()
->
PostTask
(
fxl
::
MakeCopyable
([
engine
=
shell_
->
GetEngine
(),
//
run_configuration
=
std
::
move
(
run_configuration
)
//
fxl
::
MakeCopyable
([
engine
=
shell_
->
GetEngine
(),
//
run_configuration
=
std
::
move
(
run_configuration
),
//
on_run_failure
//
]()
mutable
{
if
(
!
engine
||
!
engine
->
Run
(
std
::
move
(
run_configuration
)))
{
FXL_LOG
(
ERROR
)
<<
"Could not (re)launch the engine in configuration"
;
if
(
!
engine
)
{
return
;
}
if
(
!
engine
->
Run
(
std
::
move
(
run_configuration
)))
{
on_run_failure
();
}
}));
}
...
...
shell/common/engine.cc
浏览文件 @
613abf2d
...
...
@@ -109,6 +109,7 @@ bool Engine::Run(RunConfiguration configuration) {
}
if
(
!
PrepareAndLaunchIsolate
(
std
::
move
(
configuration
)))
{
FXL_LOG
(
ERROR
)
<<
"Engine not prepare and launch isolate."
;
return
false
;
}
...
...
@@ -143,12 +144,12 @@ bool Engine::PrepareAndLaunchIsolate(RunConfiguration configuration) {
auto
isolate
=
runtime_controller_
->
GetRootIsolate
();
if
(
!
isolate_configuration
->
PrepareIsolate
(
isolate
))
{
FXL_
D
LOG
(
ERROR
)
<<
"Could not prepare to run the isolate."
;
FXL_LOG
(
ERROR
)
<<
"Could not prepare to run the isolate."
;
return
false
;
}
if
(
!
isolate
->
Run
(
configuration
.
GetEntrypoint
()))
{
FXL_
D
LOG
(
ERROR
)
<<
"Could not run the isolate."
;
FXL_LOG
(
ERROR
)
<<
"Could not run the isolate."
;
return
false
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录