Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_34031325
engine
提交
2927e9fb
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,发现更多精彩内容 >>
未验证
提交
2927e9fb
编写于
1月 19, 2021
作者:
G
gaaclarke
提交者:
GitHub
1月 19, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
block thread merging with shared engines (#23733)
上级
8b27e6fb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
0 deletion
+33
-0
shell/common/rasterizer.cc
shell/common/rasterizer.cc
+11
-0
shell/common/rasterizer.h
shell/common/rasterizer.h
+10
-0
shell/common/shell.cc
shell/common/shell.cc
+12
-0
未找到文件。
shell/common/rasterizer.cc
浏览文件 @
2927e9fb
...
...
@@ -466,6 +466,17 @@ RasterStatus Rasterizer::DrawToSurface(flutter::LayerTree& layer_tree) {
raster_status
==
RasterStatus
::
kSkipAndRetry
)
{
return
raster_status
;
}
if
(
shared_engine_block_thread_merging_
&&
raster_thread_merger_
&&
raster_thread_merger_
->
IsMerged
())
{
// TODO(73620): Remove when platform views are accounted for.
FML_LOG
(
ERROR
)
<<
"Error: Thread merging not implemented for engines with shared "
"components.
\n\n
"
"This is likely a result of using platform views with enigne "
"groups. See "
"https://github.com/flutter/flutter/issues/73620."
;
fml
::
KillProcess
();
}
if
(
external_view_embedder_
&&
(
!
raster_thread_merger_
||
raster_thread_merger_
->
IsMerged
()))
{
FML_DCHECK
(
!
frame
->
IsSubmitted
());
...
...
shell/common/rasterizer.h
浏览文件 @
2927e9fb
...
...
@@ -434,6 +434,15 @@ class Rasterizer final : public SnapshotDelegate {
///
void
DisableThreadMergerIfNeeded
();
/// @brief Mechanism to stop thread merging when using shared engine
/// components.
/// @details This is a temporary workaround until thread merging can be
/// supported correctly. This should be called on the raster
/// thread.
/// @see https://github.com/flutter/flutter/issues/73620
///
void
BlockThreadMerging
()
{
shared_engine_block_thread_merging_
=
true
;
}
private:
Delegate
&
delegate_
;
std
::
unique_ptr
<
Surface
>
surface_
;
...
...
@@ -450,6 +459,7 @@ class Rasterizer final : public SnapshotDelegate {
fml
::
RefPtr
<
fml
::
RasterThreadMerger
>
raster_thread_merger_
;
fml
::
TaskRunnerAffineWeakPtrFactory
<
Rasterizer
>
weak_factory_
;
std
::
shared_ptr
<
ExternalViewEmbedder
>
external_view_embedder_
;
bool
shared_engine_block_thread_merging_
=
false
;
// |SnapshotDelegate|
sk_sp
<
SkImage
>
MakeRasterSnapshot
(
sk_sp
<
SkPicture
>
picture
,
...
...
shell/common/shell.cc
浏览文件 @
2927e9fb
...
...
@@ -500,6 +500,18 @@ std::unique_ptr<Shell> Shell::Spawn(
}));
result
->
shared_resource_context_
=
io_manager_
->
GetSharedResourceContext
();
result
->
RunEngine
(
std
::
move
(
run_configuration
));
task_runners_
.
GetRasterTaskRunner
()
->
PostTask
(
[
rasterizer
=
rasterizer_
->
GetWeakPtr
(),
spawn_rasterizer
=
result
->
rasterizer_
->
GetWeakPtr
()]()
{
if
(
rasterizer
)
{
rasterizer
->
BlockThreadMerging
();
}
if
(
spawn_rasterizer
)
{
spawn_rasterizer
->
BlockThreadMerging
();
}
});
return
result
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录