Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
3a463204
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,发现更多精彩内容 >>
提交
3a463204
编写于
10月 09, 2015
作者:
I
Ian Fischer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename skyx to flx in sky.
This is needed for coordination with sky_tools development.
上级
8b21e382
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
13 deletion
+13
-13
sky/shell/BUILD.gn
sky/shell/BUILD.gn
+1
-1
sky/shell/android/org/domokit/sky/shell/SkyApplication.java
sky/shell/android/org/domokit/sky/shell/SkyApplication.java
+1
-1
sky/shell/ios/sky_surface.mm
sky/shell/ios/sky_surface.mm
+9
-9
sky/shell/mac/sky_window.mm
sky/shell/mac/sky_window.mm
+2
-2
未找到文件。
sky/shell/BUILD.gn
浏览文件 @
3a463204
...
...
@@ -176,7 +176,7 @@ if (is_android) {
native_libs = [ "libsky_shell.so" ]
asset_location = "$root_build_dir/sky_shell/assets"
extensions_to_not_compress = ".
sky
x"
extensions_to_not_compress = ".
fl
x"
deps = [
":assets",
...
...
sky/shell/android/org/domokit/sky/shell/SkyApplication.java
浏览文件 @
3a463204
...
...
@@ -35,7 +35,7 @@ import org.domokit.vsync.VSyncProviderImpl;
*/
public
class
SkyApplication
extends
BaseChromiumApplication
{
static
final
String
SNAPSHOT
=
"snapshot_blob.bin"
;
static
final
String
APP_BUNDLE
=
"app.
sky
x"
;
static
final
String
APP_BUNDLE
=
"app.
fl
x"
;
static
final
String
MANIFEST
=
"sky.yaml"
;
private
static
final
String
TAG
=
"SkyApplication"
;
...
...
sky/shell/ios/sky_surface.mm
浏览文件 @
3a463204
...
...
@@ -186,13 +186,13 @@ static std::string SkPictureTracingPath() {
}
-
(
NSString
*
)
skyInitialBundleURL
{
NSString
*
skyxBundlePath
=
[[
NSBundle
mainBundle
]
pathForResource
:
@"app"
ofType
:
@"sky
x"
];
NSString
*
flxBundlePath
=
[[
NSBundle
mainBundle
]
pathForResource
:
@"app"
ofType
:
@"fl
x"
];
#ifndef NDEBUG
NSFileManager
*
fileManager
=
[
NSFileManager
defaultManager
];
NSError
*
error
=
nil
;
NSArray
*
paths
=
NSSearchPathForDirectoriesInDomains
(
NSDocumentDirectory
,
NSUserDomainMask
,
YES
);
NSString
*
documentsDirectory
=
[
paths
objectAtIndex
:
0
];
NSString
*
skyxDocsPath
=
[
documentsDirectory
stringByAppendingPathComponent
:
@"app.sky
x"
];
NSString
*
flxDocsPath
=
[
documentsDirectory
stringByAppendingPathComponent
:
@"app.fl
x"
];
// Write an empty file to help identify the correct simulator app by its bundle id. See sky_tool for its use.
NSString
*
bundleIDPath
=
[
documentsDirectory
stringByAppendingPathComponent
:[[
NSBundle
mainBundle
]
bundleIdentifier
]];
...
...
@@ -201,16 +201,16 @@ static std::string SkPictureTracingPath() {
NSLog
(
@"Couldn't write the bundle id file %@: auto reloading on the iOS simulator won't work
\n
%@"
,
bundleIDPath
,
error
);
}
if
(
skyxBundlePath
!=
nil
&&
[
fileManager
fileExistsAtPath
:
sky
xDocsPath
]
==
NO
)
{
if
([
fileManager
copyItemAtPath
:
skyxBundlePath
toPath
:
sky
xDocsPath
error
:&
error
])
{
return
sky
xDocsPath
;
if
(
flxBundlePath
!=
nil
&&
[
fileManager
fileExistsAtPath
:
fl
xDocsPath
]
==
NO
)
{
if
([
fileManager
copyItemAtPath
:
flxBundlePath
toPath
:
fl
xDocsPath
error
:&
error
])
{
return
fl
xDocsPath
;
}
NSLog
(
@"Error encountered copying app.
sky
x from the Bundle to the Documents directory. Dynamic reloading will not be possible. %@"
,
error
);
return
sky
xBundlePath
;
NSLog
(
@"Error encountered copying app.
fl
x from the Bundle to the Documents directory. Dynamic reloading will not be possible. %@"
,
error
);
return
fl
xBundlePath
;
}
return
sky
xDocsPath
;
return
fl
xDocsPath
;
#endif
return
sky
xBundlePath
;
return
fl
xBundlePath
;
}
-
(
void
)
connectToEngineAndLoad
{
...
...
sky/shell/mac/sky_window.mm
浏览文件 @
3a463204
...
...
@@ -73,13 +73,13 @@ static inline sky::EventType EventTypeFromNSEventPhase(NSEventPhase phase) {
}
-
(
NSString
*
)
skyInitialBundleURL
{
return
[[
NSBundle
mainBundle
]
pathForResource
:
@"app"
ofType
:
@"
sky
x"
];
return
[[
NSBundle
mainBundle
]
pathForResource
:
@"app"
ofType
:
@"
fl
x"
];
}
// TODO(eseidel): This does not belong in sky_window!
// Probably belongs in NSApplicationDelegate didFinishLaunching.
// We also want a separate setup for normal apps vs SkyShell
// normal apps only use a
sky
x vs. SkyShell which always pulls from network.
// normal apps only use a
fl
x vs. SkyShell which always pulls from network.
-
(
void
)
setupAndLoadDart
{
auto
interface_request
=
mojo
::
GetProxy
(
&
_sky_engine
);
self
.
platformView
->
ConnectToEngine
(
interface_request
.
Pass
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录