Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_34031325
engine
提交
5d13dc00
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,发现更多精彩内容 >>
提交
5d13dc00
编写于
11月 10, 2016
作者:
A
Adam Barth
提交者:
GitHub
11月 10, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add support for child view on Fuchsia (#3217)
上级
c118c7ee
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
27 addition
and
6 deletion
+27
-6
content_handler/rasterizer.cc
content_handler/rasterizer.cc
+2
-1
content_handler/runtime_holder.cc
content_handler/runtime_holder.cc
+13
-0
content_handler/runtime_holder.h
content_handler/runtime_holder.h
+1
-0
lib/io/dart_io.h
lib/io/dart_io.h
+3
-3
lib/snapshot/BUILD.gn
lib/snapshot/BUILD.gn
+7
-2
lib/snapshot/snapshot_fuchsia.dart
lib/snapshot/snapshot_fuchsia.dart
+1
-0
未找到文件。
content_handler/rasterizer.cc
浏览文件 @
5d13dc00
...
...
@@ -64,9 +64,10 @@ void Rasterizer::Draw(std::unique_ptr<flow::LayerTree> layer_tree,
root_node
->
op
->
set_image
(
mozart
::
ImageNodeOp
::
New
());
root_node
->
op
->
get_image
()
->
content_rect
=
bounds
.
Clone
();
root_node
->
op
->
get_image
()
->
image_resource_id
=
kContentImageResourceId
;
update
->
nodes
.
insert
(
kRootNodeId
,
std
::
move
(
root_node
));
layer_tree
->
UpdateScene
(
update
.
get
(),
root_node
.
get
());
update
->
nodes
.
insert
(
kRootNodeId
,
std
::
move
(
root_node
));
}
else
{
update
->
nodes
.
insert
(
kRootNodeId
,
mozart
::
Node
::
New
());
}
...
...
content_handler/runtime_holder.cc
浏览文件 @
5d13dc00
...
...
@@ -173,6 +173,7 @@ void RuntimeHolder::DidCreateMainIsolate(Dart_Isolate isolate) {
if
(
asset_store_
)
blink
::
AssetFontSelector
::
Install
(
asset_store_
);
InitFidlInternal
();
InitMozartInternal
();
}
void
RuntimeHolder
::
InitFidlInternal
()
{
...
...
@@ -200,6 +201,18 @@ void RuntimeHolder::InitFidlInternal() {
DartConverter
<
mx
::
channel
>::
ToDart
(
outgoing_services_
.
PassChannel
())));
}
void
RuntimeHolder
::
InitMozartInternal
()
{
fidl
::
InterfaceHandle
<
mozart
::
ViewContainer
>
view_container
;
view_
->
GetContainer
(
fidl
::
GetProxy
(
&
view_container
));
Dart_Handle
mozart_internal
=
Dart_LookupLibrary
(
ToDart
(
"dart:mozart.internal"
));
DART_CHECK_VALID
(
Dart_SetField
(
mozart_internal
,
ToDart
(
"_viewContainer"
),
DartConverter
<
mx
::
channel
>::
ToDart
(
view_container
.
PassHandle
())));
}
void
RuntimeHolder
::
InitRootBundle
(
std
::
vector
<
char
>
bundle
)
{
root_bundle_data_
=
std
::
move
(
bundle
);
asset_store_
=
ftl
::
MakeRefCounted
<
blink
::
ZipAssetStore
>
(
...
...
content_handler/runtime_holder.h
浏览文件 @
5d13dc00
...
...
@@ -63,6 +63,7 @@ class RuntimeHolder : public blink::RuntimeDelegate,
void
HandleAssetPlatformMessage
(
ftl
::
RefPtr
<
blink
::
PlatformMessage
>
message
);
void
InitFidlInternal
();
void
InitMozartInternal
();
void
BeginFrame
();
void
OnFrameComplete
();
...
...
lib/io/dart_io.h
浏览文件 @
5d13dc00
...
...
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef FLUTTER_
TONIC
_DART_IO_H_
#define FLUTTER_
TONIC
_DART_IO_H_
#ifndef FLUTTER_
LIB_IO
_DART_IO_H_
#define FLUTTER_
LIB_IO
_DART_IO_H_
#include "lib/ftl/macros.h"
...
...
@@ -19,4 +19,4 @@ class DartIO {
}
// namespace blink
#endif // FLUTTER_
TONIC
_DART_IO_H_
#endif // FLUTTER_
LIB_IO
_DART_IO_H_
lib/snapshot/BUILD.gn
浏览文件 @
5d13dc00
...
...
@@ -9,6 +9,7 @@ import("//flutter/lib/ui/dart_ui.gni")
target_is_fuchsia = target_os == "fuchsia"
if (target_is_fuchsia) {
import("//apps/mozart/lib/flutter/sdk_ext/sdk_ext.gni")
import("//lib/fidl/dart/sdk_ext/sdk_ext.gni")
}
...
...
@@ -81,9 +82,13 @@ action("generate_snapshot_bin") {
]
if (target_is_fuchsia) {
inputs += fidl_dart_sdk_ext_files
inputs += fidl_dart_sdk_ext_files
+ mozart_dart_sdk_ext_files
fidl_internal_path = rebase_path(fidl_dart_sdk_ext_lib)
args += [ "--url_mapping=dart:fidl.internal,$fidl_internal_path" ]
mozart_internal_path = rebase_path(mozart_dart_sdk_ext_lib)
args += [
"--url_mapping=dart:fidl.internal,$fidl_internal_path",
"--url_mapping=dart:mozart.internal,$mozart_internal_path",
]
}
}
...
...
lib/snapshot/snapshot_fuchsia.dart
浏览文件 @
5d13dc00
...
...
@@ -11,5 +11,6 @@ import 'dart:fidl.internal';
import
'dart:io'
;
import
'dart:isolate'
;
import
'dart:math'
;
import
'dart:mozart.internal'
;
import
'dart:typed_data'
;
import
'dart:ui'
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录