Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_34031325
engine
提交
33b41231
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,发现更多精彩内容 >>
未验证
提交
33b41231
编写于
8月 01, 2018
作者:
C
Chinmay Garde
提交者:
GitHub
8月 01, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix sundry Fuchsia build issues after the tonic/fxl migration. (#5920)
上级
03a4e53a
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
21 addition
and
9 deletion
+21
-9
flow/BUILD.gn
flow/BUILD.gn
+2
-0
flow/scene_update_context.h
flow/scene_update_context.h
+1
-0
fml/BUILD.gn
fml/BUILD.gn
+4
-0
fml/trace_event.h
fml/trace_event.h
+8
-4
lib/ui/compositing/scene_host.h
lib/ui/compositing/scene_host.h
+1
-0
runtime/dart_vm.cc
runtime/dart_vm.cc
+5
-5
未找到文件。
flow/BUILD.gn
浏览文件 @
33b41231
...
...
@@ -60,6 +60,8 @@ source_set("flow") {
public_configs = [ "$flutter_root:config" ]
public_deps = []
deps = [
"$flutter_root/common",
"$flutter_root/fml",
...
...
flow/scene_update_context.h
浏览文件 @
33b41231
...
...
@@ -11,6 +11,7 @@
#include "flutter/flow/compositor_context.h"
#include "flutter/fml/build_config.h"
#include "flutter/fml/compiler_specific.h"
#include "flutter/fml/logging.h"
#include "flutter/fml/macros.h"
#include "lib/ui/scenic/cpp/resources.h"
...
...
fml/BUILD.gn
浏览文件 @
33b41231
...
...
@@ -60,6 +60,8 @@ source_set("fml") {
"unique_object.h",
]
public_deps = []
deps = [
"//third_party/dart/runtime:dart_api",
...
...
@@ -129,6 +131,8 @@ source_set("fml") {
if (is_fuchsia) {
sources += [ "platform/fuchsia/paths_fuchsia.cc" ]
public_deps += [ "//zircon/public/lib/trace-provider" ]
}
if (is_win) {
...
...
fml/trace_event.h
浏览文件 @
33b41231
...
...
@@ -5,7 +5,9 @@
#ifndef FLUTTER_FML_TRACE_EVENT_H_
#define FLUTTER_FML_TRACE_EVENT_H_
#if defined(__Fuchsia__)
#include "flutter/fml/build_config.h"
#if defined(OS_FUCHSIA)
// Forward to the system tracing mechanism on Fuchsia.
...
...
@@ -19,7 +21,7 @@
#define TRACE_EVENT_ASYNC_BEGIN1(a, b, c, d, e) TRACE_ASYNC_BEGIN(a, b, c, d, e)
#define TRACE_EVENT_ASYNC_END1(a, b, c, d, e) TRACE_ASYNC_END(a, b, c, d, e)
#e
lse // defined(__Fuchsia__
)
#e
ndif // defined(OS_FUCHSIA
)
#include <cstddef>
#include <cstdint>
...
...
@@ -27,6 +29,8 @@
#include "flutter/fml/macros.h"
#if !defined(OS_FUCHSIA)
#ifndef TRACE_EVENT_HIDE_MACROS
#define TRACE_EVENT0(category_group, name) \
...
...
@@ -72,6 +76,8 @@
#endif // TRACE_EVENT_HIDE_MACROS
#endif // !defined(OS_FUCHSIA)
namespace
fml
{
namespace
tracing
{
...
...
@@ -137,6 +143,4 @@ class ScopedInstantEnd {
}
// namespace tracing
}
// namespace fml
#endif // defined(__Fuchsia__)
#endif // FLUTTER_FML_TRACE_EVENT_H_
lib/ui/compositing/scene_host.h
浏览文件 @
33b41231
...
...
@@ -7,6 +7,7 @@
#include <stdint.h>
#include "flutter/fml/build_config.h"
#include "flutter/lib/ui/dart_wrapper.h"
#if defined(OS_FUCHSIA)
...
...
runtime/dart_vm.cc
浏览文件 @
33b41231
...
...
@@ -14,6 +14,7 @@
#include "flutter/fml/compiler_specific.h"
#include "flutter/fml/file.h"
#include "flutter/fml/logging.h"
#include "flutter/fml/mapping.h"
#include "flutter/fml/time/time_delta.h"
#include "flutter/fml/trace_event.h"
#include "flutter/lib/io/dart_io.h"
...
...
@@ -155,14 +156,13 @@ Dart_Handle GetVMServiceAssetsArchiveCallback() {
(FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DYNAMIC_RELEASE)
return
nullptr
;
#elif OS_FUCHSIA
std
::
vector
<
uint8_t
>
observatory_assets_archive
;
if
(
!
files
::
ReadFileToVector
(
"pkg/data/observatory.tar"
,
&
observatory_assets_archive
))
{
fml
::
FileMapping
mapping
(
"pkg/data/observatory.tar"
,
false
/* executable */
);
if
(
mapping
.
GetSize
()
==
0
||
mapping
.
GetMapping
()
==
nullptr
)
{
FML_LOG
(
ERROR
)
<<
"Fail to load Observatory archive"
;
return
nullptr
;
}
return
tonic
::
DartConverter
<
tonic
::
Uint8List
>::
ToDart
(
observatory_assets_archive
.
data
(),
observatory_assets_archive
.
s
ize
());
return
tonic
::
DartConverter
<
tonic
::
Uint8List
>::
ToDart
(
mapping
.
GetMapping
(),
mapping
.
GetS
ize
());
#else
return
tonic
::
DartConverter
<
tonic
::
Uint8List
>::
ToDart
(
::
dart
::
observatory
::
observatory_assets_archive
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录