Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
933c8b84
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
未验证
提交
933c8b84
编写于
7月 23, 2020
作者:
E
Emmanuel Garcia
提交者:
GitHub
7月 23, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bool SubmitFrame -> void SubmitFrame (#18984)
上级
48f90888
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
16 addition
and
19 deletion
+16
-19
flow/embedded_views.cc
flow/embedded_views.cc
+2
-2
flow/embedded_views.h
flow/embedded_views.h
+1
-1
shell/common/shell_test_external_view_embedder.cc
shell/common/shell_test_external_view_embedder.cc
+2
-2
shell/common/shell_test_external_view_embedder.h
shell/common/shell_test_external_view_embedder.h
+1
-1
shell/platform/android/external_view_embedder/external_view_embedder.cc
.../android/external_view_embedder/external_view_embedder.cc
+2
-3
shell/platform/android/external_view_embedder/external_view_embedder.h
...m/android/external_view_embedder/external_view_embedder.h
+1
-1
shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc
...xternal_view_embedder/external_view_embedder_unittests.cc
+0
-1
shell/platform/darwin/ios/ios_surface.h
shell/platform/darwin/ios/ios_surface.h
+1
-1
shell/platform/darwin/ios/ios_surface.mm
shell/platform/darwin/ios/ios_surface.mm
+1
-2
shell/platform/embedder/embedder_external_view_embedder.cc
shell/platform/embedder/embedder_external_view_embedder.cc
+4
-4
shell/platform/embedder/embedder_external_view_embedder.h
shell/platform/embedder/embedder_external_view_embedder.h
+1
-1
未找到文件。
flow/embedded_views.cc
浏览文件 @
933c8b84
...
...
@@ -6,9 +6,9 @@
namespace
flutter
{
bool
ExternalViewEmbedder
::
SubmitFrame
(
GrContext
*
context
,
void
ExternalViewEmbedder
::
SubmitFrame
(
GrContext
*
context
,
std
::
unique_ptr
<
SurfaceFrame
>
frame
)
{
return
frame
->
Submit
();
frame
->
Submit
();
};
void
MutatorsStack
::
PushClipRect
(
const
SkRect
&
rect
)
{
...
...
flow/embedded_views.h
浏览文件 @
933c8b84
...
...
@@ -295,7 +295,7 @@ class ExternalViewEmbedder {
// This method can mutate the root Skia canvas before submitting the frame.
//
// It can also allocate frames for overlay surfaces to compose hybrid views.
virtual
bool
SubmitFrame
(
GrContext
*
context
,
virtual
void
SubmitFrame
(
GrContext
*
context
,
std
::
unique_ptr
<
SurfaceFrame
>
frame
);
// This method provides the embedder a way to do additional tasks after
...
...
shell/common/shell_test_external_view_embedder.cc
浏览文件 @
933c8b84
...
...
@@ -35,10 +35,10 @@ SkCanvas* ShellTestExternalViewEmbedder::CompositeEmbeddedView(int view_id) {
}
// |ExternalViewEmbedder|
bool
ShellTestExternalViewEmbedder
::
SubmitFrame
(
void
ShellTestExternalViewEmbedder
::
SubmitFrame
(
GrContext
*
context
,
std
::
unique_ptr
<
SurfaceFrame
>
frame
)
{
return
frame
->
Submit
();
frame
->
Submit
();
}
// |ExternalViewEmbedder|
...
...
shell/common/shell_test_external_view_embedder.h
浏览文件 @
933c8b84
...
...
@@ -51,7 +51,7 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder {
SkCanvas
*
CompositeEmbeddedView
(
int
view_id
)
override
;
// |ExternalViewEmbedder|
bool
SubmitFrame
(
GrContext
*
context
,
void
SubmitFrame
(
GrContext
*
context
,
std
::
unique_ptr
<
SurfaceFrame
>
frame
)
override
;
// |ExternalViewEmbedder|
...
...
shell/platform/android/external_view_embedder/external_view_embedder.cc
浏览文件 @
933c8b84
...
...
@@ -72,14 +72,14 @@ SkRect AndroidExternalViewEmbedder::GetViewRect(int view_id) const {
}
// |ExternalViewEmbedder|
bool
AndroidExternalViewEmbedder
::
SubmitFrame
(
void
AndroidExternalViewEmbedder
::
SubmitFrame
(
GrContext
*
context
,
std
::
unique_ptr
<
SurfaceFrame
>
frame
)
{
TRACE_EVENT0
(
"flutter"
,
"AndroidExternalViewEmbedder::SubmitFrame"
);
if
(
should_run_rasterizer_on_platform_thread_
)
{
// Don't submit the current frame if the frame will be resubmitted.
return
true
;
return
;
}
std
::
unordered_map
<
int64_t
,
std
::
list
<
SkRect
>>
overlay_layers
;
...
...
@@ -181,7 +181,6 @@ bool AndroidExternalViewEmbedder::SubmitFrame(
}
}
}
return
true
;
}
// |ExternalViewEmbedder|
...
...
shell/platform/android/external_view_embedder/external_view_embedder.h
浏览文件 @
933c8b84
...
...
@@ -45,7 +45,7 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
std
::
vector
<
SkCanvas
*>
GetCurrentCanvases
()
override
;
// |ExternalViewEmbedder|
bool
SubmitFrame
(
GrContext
*
context
,
void
SubmitFrame
(
GrContext
*
context
,
std
::
unique_ptr
<
SurfaceFrame
>
frame
)
override
;
// |ExternalViewEmbedder|
...
...
shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc
浏览文件 @
933c8b84
...
...
@@ -161,7 +161,6 @@ TEST(AndroidExternalViewEmbedder, RasterizerRunsOnPlatformThread) {
auto
postpreroll_result
=
embedder
->
PostPrerollAction
(
raster_thread_merger
);
ASSERT_EQ
(
PostPrerollResult
::
kResubmitFrame
,
postpreroll_result
);
ASSERT_TRUE
(
embedder
->
SubmitFrame
(
nullptr
,
nullptr
));
EXPECT_CALL
(
*
jni_mock
,
FlutterViewEndFrame
());
embedder
->
EndFrame
(
/*should_resubmit_frame=*/
true
,
raster_thread_merger
);
...
...
shell/platform/darwin/ios/ios_surface.h
浏览文件 @
933c8b84
...
...
@@ -82,7 +82,7 @@ class IOSSurface : public ExternalViewEmbedder {
SkCanvas
*
CompositeEmbeddedView
(
int
view_id
)
override
;
// |ExternalViewEmbedder|
bool
SubmitFrame
(
GrContext
*
context
,
std
::
unique_ptr
<
SurfaceFrame
>
frame
)
override
;
void
SubmitFrame
(
GrContext
*
context
,
std
::
unique_ptr
<
SurfaceFrame
>
frame
)
override
;
// |ExternalViewEmbedder|
void
EndFrame
(
bool
should_resubmit_frame
,
...
...
shell/platform/darwin/ios/ios_surface.mm
浏览文件 @
933c8b84
...
...
@@ -135,7 +135,7 @@ SkCanvas* IOSSurface::CompositeEmbeddedView(int view_id) {
}
// |ExternalViewEmbedder|
bool
IOSSurface
::
SubmitFrame
(
GrContext
*
context
,
std
::
unique_ptr
<
SurfaceFrame
>
frame
)
{
void
IOSSurface
::
SubmitFrame
(
GrContext
*
context
,
std
::
unique_ptr
<
SurfaceFrame
>
frame
)
{
TRACE_EVENT0
(
"flutter"
,
"IOSSurface::SubmitFrame"
);
FML_CHECK
(
platform_views_controller_
!=
nullptr
);
bool
submitted
=
...
...
@@ -145,7 +145,6 @@ bool IOSSurface::SubmitFrame(GrContext* context, std::unique_ptr<SurfaceFrame> f
TRACE_EVENT0
(
"flutter"
,
"IOSSurface::DidSubmitFrame"
);
[
CATransaction
commit
];
}
return
submitted
;
}
// |ExternalViewEmbedder|
...
...
shell/platform/embedder/embedder_external_view_embedder.cc
浏览文件 @
933c8b84
...
...
@@ -131,7 +131,7 @@ static FlutterBackingStoreConfig MakeBackingStoreConfig(
}
// |ExternalViewEmbedder|
bool
EmbedderExternalViewEmbedder
::
SubmitFrame
(
void
EmbedderExternalViewEmbedder
::
SubmitFrame
(
GrContext
*
context
,
std
::
unique_ptr
<
SurfaceFrame
>
frame
)
{
auto
[
matched_render_targets
,
pending_keys
]
=
...
...
@@ -185,7 +185,7 @@ bool EmbedderExternalViewEmbedder::SubmitFrame(
if
(
!
render_target
)
{
FML_LOG
(
ERROR
)
<<
"Embedder did not return a valid render target."
;
return
false
;
return
;
}
matched_render_targets
[
pending_key
]
=
std
::
move
(
render_target
);
}
...
...
@@ -204,7 +204,7 @@ bool EmbedderExternalViewEmbedder::SubmitFrame(
->
Render
(
*
render_target
.
second
))
{
FML_LOG
(
ERROR
)
<<
"Could not render into the embedder supplied render target."
;
return
false
;
return
;
}
}
...
...
@@ -266,7 +266,7 @@ bool EmbedderExternalViewEmbedder::SubmitFrame(
std
::
move
(
render_target
.
second
));
}
return
frame
->
Submit
();
frame
->
Submit
();
}
}
// namespace flutter
shell/platform/embedder/embedder_external_view_embedder.h
浏览文件 @
933c8b84
...
...
@@ -91,7 +91,7 @@ class EmbedderExternalViewEmbedder final : public ExternalViewEmbedder {
SkCanvas
*
CompositeEmbeddedView
(
int
view_id
)
override
;
// |ExternalViewEmbedder|
bool
SubmitFrame
(
GrContext
*
context
,
void
SubmitFrame
(
GrContext
*
context
,
std
::
unique_ptr
<
SurfaceFrame
>
frame
)
override
;
// |ExternalViewEmbedder|
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录