Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_34031325
engine
提交
b0d50e48
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,发现更多精彩内容 >>
提交
b0d50e48
编写于
7月 11, 2016
作者:
J
John McCutchan
提交者:
GitHub
7月 11, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix service isolate startup (#2788)
上级
469d954a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
1 deletion
+11
-1
sky/engine/core/script/dart_init.cc
sky/engine/core/script/dart_init.cc
+5
-1
sky/engine/core/script/dart_service_isolate.cc
sky/engine/core/script/dart_service_isolate.cc
+5
-0
sky/engine/core/script/dart_service_isolate.h
sky/engine/core/script/dart_service_isolate.h
+1
-0
未找到文件。
sky/engine/core/script/dart_init.cc
浏览文件 @
b0d50e48
...
...
@@ -171,8 +171,12 @@ Dart_Isolate ServiceIsolateCreateCallback(const char* script_uri,
if
(
settings
.
enable_observatory
)
{
std
::
string
ip
=
"127.0.0.1"
;
const
intptr_t
port
=
settings
.
observatory_port
;
const
bool
disable_websocket_origin_check
=
false
;
const
bool
service_isolate_booted
=
DartServiceIsolate
::
Startup
(
ip
,
port
,
DartLibraryTagHandler
,
IsRunningPrecompiledCode
(),
error
);
ip
,
port
,
DartLibraryTagHandler
,
IsRunningPrecompiledCode
(),
disable_websocket_origin_check
,
error
);
CHECK
(
service_isolate_booted
)
<<
error
;
}
...
...
sky/engine/core/script/dart_service_isolate.cc
浏览文件 @
b0d50e48
...
...
@@ -82,6 +82,7 @@ bool DartServiceIsolate::Startup(std::string server_ip,
intptr_t
server_port
,
Dart_LibraryTagHandler
embedder_tag_handler
,
bool
running_precompiled
,
bool
disable_origin_check
,
char
**
error
)
{
Dart_Isolate
isolate
=
Dart_CurrentIsolate
();
CHECK
(
isolate
);
...
...
@@ -167,6 +168,10 @@ bool DartServiceIsolate::Startup(std::string server_ip,
Dart_NewStringFromCString
(
"_autoStart"
),
Dart_NewBoolean
(
auto_start
));
SHUTDOWN_ON_ERROR
(
result
);
result
=
Dart_SetField
(
library
,
Dart_NewStringFromCString
(
"_originCheckDisabled"
),
Dart_NewBoolean
(
disable_origin_check
));
SHUTDOWN_ON_ERROR
(
result
);
return
true
;
}
...
...
sky/engine/core/script/dart_service_isolate.h
浏览文件 @
b0d50e48
...
...
@@ -19,6 +19,7 @@ class DartServiceIsolate {
intptr_t
server_port
,
Dart_LibraryTagHandler
embedder_tag_handler
,
bool
running_precompiled
,
bool
disable_origin_check
,
char
**
error
);
static
int
GetObservatoryPort
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录