Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
liujiuri
engine
提交
94bee9d7
E
engine
项目概览
liujiuri
/
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,发现更多精彩内容 >>
未验证
提交
94bee9d7
编写于
3月 14, 2018
作者:
M
mikejurka
提交者:
GitHub
3月 14, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[scenic] Rename mozart->scenic. (#4792)
上级
f192c59d
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
21 addition
and
21 deletion
+21
-21
content_handler/rasterizer.h
content_handler/rasterizer.h
+1
-1
content_handler/runtime_holder.cc
content_handler/runtime_holder.cc
+6
-6
content_handler/runtime_holder.h
content_handler/runtime_holder.h
+1
-1
content_handler/session_connection.cc
content_handler/session_connection.cc
+5
-5
content_handler/session_connection.h
content_handler/session_connection.h
+3
-3
content_handler/vulkan_rasterizer.cc
content_handler/vulkan_rasterizer.cc
+2
-2
content_handler/vulkan_rasterizer.h
content_handler/vulkan_rasterizer.h
+1
-1
flow/export_node.cc
flow/export_node.cc
+1
-1
flow/scene_update_context.cc
flow/scene_update_context.cc
+1
-1
未找到文件。
content_handler/rasterizer.h
浏览文件 @
94bee9d7
...
...
@@ -21,7 +21,7 @@ class Rasterizer {
static
std
::
unique_ptr
<
Rasterizer
>
Create
();
virtual
void
SetScene
(
f1dl
::
InterfaceHandle
<
ui
_mozart
::
Mozart
>
mozart
,
f1dl
::
InterfaceHandle
<
ui
::
Scenic
>
mozart
,
zx
::
eventpair
import_token
,
fxl
::
Closure
metrics_changed_callback
)
=
0
;
...
...
content_handler/runtime_holder.cc
浏览文件 @
94bee9d7
...
...
@@ -238,18 +238,18 @@ void RuntimeHolder::CreateView(
input_connection_
->
SetEventListener
(
std
::
move
(
input_listener
));
// Setup the session.
f1dl
::
InterfaceHandle
<
ui
_mozart
::
Mozart
>
mozart
;
view_manager_
->
Get
Mozart
(
mozart
.
NewRequest
());
f1dl
::
InterfaceHandle
<
ui
::
Scenic
>
scenic
;
view_manager_
->
Get
Scenic
(
scenic
.
NewRequest
());
blink
::
Threads
::
Gpu
()
->
PostTask
(
fxl
::
MakeCopyable
([
rasterizer
=
rasterizer_
.
get
(),
//
mozart
=
std
::
move
(
mozart
),
//
scenic
=
std
::
move
(
scenic
),
//
import_token
=
std
::
move
(
import_token
),
//
weak_runtime_holder
=
GetWeakPtr
()
]()
mutable
{
ASSERT_IS_GPU_THREAD
;
rasterizer
->
SetScene
(
std
::
move
(
mozart
),
std
::
move
(
import_token
),
std
::
move
(
scenic
),
std
::
move
(
import_token
),
// TODO(MZ-222): Ideally we would immediately redraw the previous layer
// tree when the metrics change since there's no need to rerecord it.
// However, we want to make sure there's only one outstanding frame.
...
...
@@ -419,7 +419,7 @@ void RuntimeHolder::DidCreateMainIsolate(Dart_Isolate isolate) {
InitDartIoInternal
();
InitFuchsia
();
InitZircon
();
Init
Mozart
Internal
();
Init
Scenic
Internal
();
}
void
RuntimeHolder
::
InitDartIoInternal
()
{
...
...
@@ -466,7 +466,7 @@ void RuntimeHolder::InitZircon() {
ToDart
(
reinterpret_cast
<
intptr_t
>
(
namespc_
))));
}
void
RuntimeHolder
::
Init
Mozart
Internal
()
{
void
RuntimeHolder
::
Init
Scenic
Internal
()
{
f1dl
::
InterfaceHandle
<
mozart
::
ViewContainer
>
view_container
;
view_
->
GetContainer
(
view_container
.
NewRequest
());
...
...
content_handler/runtime_holder.h
浏览文件 @
94bee9d7
...
...
@@ -101,7 +101,7 @@ class RuntimeHolder : public blink::RuntimeDelegate,
void
InitDartIoInternal
();
void
InitFuchsia
();
void
InitZircon
();
void
Init
Mozart
Internal
();
void
Init
Scenic
Internal
();
void
PostBeginFrame
();
void
BeginFrame
();
...
...
content_handler/session_connection.cc
浏览文件 @
94bee9d7
...
...
@@ -7,9 +7,9 @@
namespace
flutter_runner
{
SessionConnection
::
SessionConnection
(
ui
_mozart
::
MozartPtr
mozart
,
SessionConnection
::
SessionConnection
(
ui
::
ScenicPtr
scenic
,
zx
::
eventpair
import_token
)
:
session_
(
mozart
.
get
()),
:
session_
(
scenic
.
get
()),
root_node_
(
&
session_
),
surface_producer_
(
std
::
make_unique
<
VulkanSurfaceProducer
>
(
&
session_
)),
scene_update_context_
(
&
session_
,
surface_producer_
.
get
())
{
...
...
@@ -22,7 +22,7 @@ SessionConnection::SessionConnection(ui_mozart::MozartPtr mozart,
root_node_
.
Bind
(
std
::
move
(
import_token
));
root_node_
.
SetEventMask
(
scenic
::
kMetricsEventMask
);
session_
.
Present
(
0
,
[](
ui
_mozart
::
PresentationInfoPtr
info
)
{});
session_
.
Present
(
0
,
[](
ui
::
PresentationInfoPtr
info
)
{});
present_callback_
=
std
::
bind
(
&
SessionConnection
::
OnPresent
,
this
,
std
::
placeholders
::
_1
);
...
...
@@ -39,7 +39,7 @@ void SessionConnection::OnSessionError() {
}
void
SessionConnection
::
OnSessionEvents
(
f1dl
::
Array
<
ui
_mozart
::
EventPtr
>
events
)
{
f1dl
::
Array
<
ui
::
EventPtr
>
events
)
{
scenic
::
MetricsPtr
new_metrics
;
for
(
const
auto
&
event
:
events
)
{
if
(
event
->
is_scenic
()
&&
event
->
get_scenic
()
->
is_metrics
()
&&
...
...
@@ -81,7 +81,7 @@ void SessionConnection::Present(flow::CompositorContext::ScopedFrame& frame,
EnqueueClearOps
();
}
void
SessionConnection
::
OnPresent
(
ui
_mozart
::
PresentationInfoPtr
info
)
{
void
SessionConnection
::
OnPresent
(
ui
::
PresentationInfoPtr
info
)
{
ASSERT_IS_GPU_THREAD
;
auto
callback
=
pending_on_present_callback_
;
pending_on_present_callback_
=
nullptr
;
...
...
content_handler/session_connection.h
浏览文件 @
94bee9d7
...
...
@@ -20,7 +20,7 @@ namespace flutter_runner {
class
SessionConnection
{
public:
SessionConnection
(
ui
_mozart
::
MozartPtr
mozart
,
zx
::
eventpair
import_token
);
SessionConnection
(
ui
::
ScenicPtr
scenic
,
zx
::
eventpair
import_token
);
~
SessionConnection
();
...
...
@@ -56,11 +56,11 @@ class SessionConnection {
fxl
::
Closure
metrics_changed_callback_
;
void
OnSessionError
();
void
OnSessionEvents
(
f1dl
::
Array
<
ui
_mozart
::
EventPtr
>
events
);
void
OnSessionEvents
(
f1dl
::
Array
<
ui
::
EventPtr
>
events
);
void
EnqueueClearOps
();
void
OnPresent
(
ui
_mozart
::
PresentationInfoPtr
info
);
void
OnPresent
(
ui
::
PresentationInfoPtr
info
);
FXL_DISALLOW_COPY_AND_ASSIGN
(
SessionConnection
);
};
...
...
content_handler/vulkan_rasterizer.cc
浏览文件 @
94bee9d7
...
...
@@ -53,13 +53,13 @@ bool VulkanRasterizer::IsValid() const {
return
valid_
;
}
void
VulkanRasterizer
::
SetScene
(
f1dl
::
InterfaceHandle
<
ui
_mozart
::
Mozart
>
mozart
,
void
VulkanRasterizer
::
SetScene
(
f1dl
::
InterfaceHandle
<
ui
::
Scenic
>
scenic
,
zx
::
eventpair
import_token
,
fxl
::
Closure
metrics_changed_callback
)
{
ASSERT_IS_GPU_THREAD
;
FXL_DCHECK
(
valid_
&&
!
session_connection_
);
session_connection_
=
std
::
make_unique
<
SessionConnection
>
(
mozart
.
Bind
(),
std
::
move
(
import_token
));
scenic
.
Bind
(),
std
::
move
(
import_token
));
session_connection_
->
set_metrics_changed_callback
(
std
::
move
(
metrics_changed_callback
));
}
...
...
content_handler/vulkan_rasterizer.h
浏览文件 @
94bee9d7
...
...
@@ -22,7 +22,7 @@ class VulkanRasterizer : public Rasterizer {
bool
IsValid
()
const
;
void
SetScene
(
f1dl
::
InterfaceHandle
<
ui
_mozart
::
Mozart
>
mozart
,
void
SetScene
(
f1dl
::
InterfaceHandle
<
ui
::
Scenic
>
scenic
,
zx
::
eventpair
import_token
,
fxl
::
Closure
metrics_changed_callback
)
override
;
...
...
flow/export_node.cc
浏览文件 @
94bee9d7
...
...
@@ -51,7 +51,7 @@ void ExportNode::Bind(SceneUpdateContext& context,
node_
.
reset
(
new
scenic_lib
::
EntityNode
(
container
.
session
()));
node_
->
Export
(
std
::
move
(
export_token_
));
// Add ourselves to the context so it can call Dispose() on us if the
Mozart
// Add ourselves to the context so it can call Dispose() on us if the
Scenic
// session is closed.
context
.
AddExportNode
(
this
);
scene_update_context_
=
&
context
;
...
...
flow/scene_update_context.cc
浏览文件 @
94bee9d7
...
...
@@ -21,7 +21,7 @@ SceneUpdateContext::SceneUpdateContext(scenic_lib::Session* session,
SceneUpdateContext
::~
SceneUpdateContext
()
{
ASSERT_IS_GPU_THREAD
;
// Release
Mozart
session resources for all ExportNodes.
// Release
Scenic
session resources for all ExportNodes.
for
(
auto
export_node
:
export_nodes_
)
{
export_node
->
Dispose
(
false
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录