Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
6ccb1e6b
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,发现更多精彩内容 >>
提交
6ccb1e6b
编写于
7月 20, 2015
作者:
C
Chinmay Garde
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
sky/engine and sky/services updates for Mac target
上级
3256b1f0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
9 deletion
+14
-9
sky/engine/core/script/dart_init.cc
sky/engine/core/script/dart_init.cc
+1
-1
sky/engine/platform/BUILD.gn
sky/engine/platform/BUILD.gn
+7
-2
sky/services/ns_net/url_loader_impl.mm
sky/services/ns_net/url_loader_impl.mm
+6
-6
未找到文件。
sky/engine/core/script/dart_init.cc
浏览文件 @
6ccb1e6b
...
...
@@ -80,7 +80,7 @@ static const char* kDartArgs[] = {
"--enable_type_checks"
,
"--error_on_bad_type"
,
"--error_on_bad_override"
,
#if WTF_OS_IOS
#if WTF_OS_IOS
|| WTF_OS_MACOSX
"--no-profile"
#endif
#endif
...
...
sky/engine/platform/BUILD.gn
浏览文件 @
6ccb1e6b
...
...
@@ -242,8 +242,6 @@ source_set("platform") {
"fonts/opentype/OpenTypeSanitizer.cpp",
"fonts/opentype/OpenTypeSanitizer.h",
"fonts/opentype/OpenTypeTypes.h",
"fonts/opentype/OpenTypeVerticalData.cpp",
"fonts/opentype/OpenTypeVerticalData.h",
"fonts/skia/FontCacheSkia.cpp",
"fonts/skia/FontCustomPlatformDataSkia.cpp",
"fonts/skia/FontPlatformDataSkia.cpp",
...
...
@@ -514,6 +512,13 @@ source_set("platform") {
"weborigin/SecurityPolicy.h",
]
if (!is_mac) {
sources += [
"fonts/opentype/OpenTypeVerticalData.cpp",
"fonts/opentype/OpenTypeVerticalData.h",
]
}
if (is_ios || is_mac) {
sources += [ "fonts/apple/FontPlatformDataApple.cpp" ]
}
...
...
sky/services/ns_net/url_loader_impl.mm
浏览文件 @
6ccb1e6b
...
...
@@ -11,6 +11,7 @@
@interface
URLLoaderConnectionDelegate
:
NSObject
<
NSURLConnectionDataDelegate
>
@property
(
nonatomic
)
mojo
::
URLLoaderImpl
::
StartCallback
startCallback
;
@property
(
nonatomic
,
retain
)
NSURLRequest
*
originalRequest
;
@end
...
...
@@ -20,13 +21,14 @@
}
@synthesize
startCallback
=
_startCallback
;
@synthesize
originalRequest
=
_originalRequest
;
-
(
void
)
connection
:(
NSURLConnection
*
)
connection
didReceiveResponse
:(
NSHTTPURLResponse
*
)
response
{
_response
=
mojo
::
URLResponse
::
New
();
_response
->
status_code
=
response
.
statusCode
;
_response
->
url
=
mojo
::
String
(
connection
.
originalRequest
.
URL
.
absoluteString
.
UTF8String
);
mojo
::
String
(
self
.
originalRequest
.
URL
.
absoluteString
.
UTF8String
);
mojo
::
DataPipe
pipe
;
_response
->
body
=
pipe
.
consumer_handle
.
Pass
();
_producer
=
pipe
.
producer_handle
.
Pass
();
...
...
@@ -61,7 +63,7 @@
if
(
_response
.
is_null
())
{
_response
=
mojo
::
URLResponse
::
New
();
_response
->
url
=
mojo
::
String
(
connection
.
originalRequest
.
URL
.
absoluteString
.
UTF8String
);
self
.
originalRequest
.
URL
.
absoluteString
.
UTF8String
);
}
_response
->
error
=
mojo
::
NetworkError
::
New
();
...
...
@@ -95,6 +97,7 @@
}
-
(
void
)
dealloc
{
[
_originalRequest
release
];
DCHECK
(
_response
.
is_null
());
DCHECK
(
_startCallback
.
is_null
());
_producer
.
reset
();
...
...
@@ -128,10 +131,6 @@ void URLLoaderImpl::Start(URLRequestPtr request,
req
.
HTTPMethod
=
@
(
request
->
method
.
data
());
if
(
request
->
bypass_cache
)
{
req
.
cachePolicy
=
NSURLRequestReloadIgnoringLocalCacheData
;
}
URLLoaderConnectionDelegate
*
delegate
=
(
URLLoaderConnectionDelegate
*
)
connection_delegate_
;
...
...
@@ -139,6 +138,7 @@ void URLLoaderImpl::Start(URLRequestPtr request,
[
NSURLConnection
connectionWithRequest
:
req
delegate
:
delegate
];
delegate
.
startCallback
=
callback
;
delegate
.
originalRequest
=
req
;
[
connection
start
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录