DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #168 from chinmaygarde/sky_engine

Browse Source 
sky/engine and sky/services updates for Mac target
This commit is contained in:
Chinmay Garde 2015-07-20 17:54:18 -07:00
commit 764ce409b8
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sky/engine/core/script/dart_init.cc
View File

@ -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

9
sky/engine/platform/BUILD.gn
View File

@ -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" ]
}

12
sky/services/ns_net/url_loader_impl.mm
View File

@ -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];