firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #894 from Hixie/rev

Browse Source 
rev the engine
This commit is contained in:
Ian Hickson 2015-12-11 21:20:08 -08:00
commit 1ab83e668f
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter/pubspec.yaml
View File

@ -7,8 +7,8 @@ dependencies:
collection: '>=1.1.3 <2.0.0'
intl: '>=0.12.4+2 <0.13.0'
material_design_icons: '>=0.0.3 <0.1.0'
sky_engine: 0.0.70
sky_services: 0.0.70
sky_engine: 0.0.71
sky_services: 0.0.71
vector_math: '>=1.4.3 <2.0.0'
# To pin the transitive dependency through mojo_sdk.

32
packages/updater/lib/pipe_to_file.dart
View File

@ -32,27 +32,27 @@ class PipeToFile {
Future<int> drain() {
Completer<int> completer = new Completer();
// TODO(mpcomplete): Is it legit to pass an async callback to subscribe?
_events.subscribe((List<int> event) async {
int signal = event[1];
if (MojoHandleSignals.isReadable(signal)) {
int result = await _doRead();
if (result != MojoResult.kOk) {
_events.subscribe((int signal) {
(() async {
if (MojoHandleSignals.isReadable(signal)) {
int result = await _doRead();
if (result != MojoResult.kOk) {
_events.close();
_events = null;
_outputStream.close();
completer.complete(result);
} else {
_events.enableReadEvents();
}
} else if (MojoHandleSignals.isPeerClosed(signal)) {
_events.close();
_events = null;
_outputStream.close();
completer.complete(result);
completer.complete(MojoResult.kOk);
} else {
_events.enableReadEvents();
throw 'Unexpected handle event: ${MojoHandleSignals.string(signal)}';
}
} else if (MojoHandleSignals.isPeerClosed(signal)) {
_events.close();
_events = null;
_outputStream.close();
completer.complete(MojoResult.kOk);
} else {
throw 'Unexpected handle event: ${MojoHandleSignals.string(signal)}';
}
})();
});
return completer.future;
}