Index: mojo/public/dart/mojo/lib/src/drain_data.dart |
diff --git a/mojo/public/dart/mojo/lib/src/drain_data.dart b/mojo/public/dart/mojo/lib/src/drain_data.dart |
index b5929e567a3191f1582a32bcc011bb28a9a43549..47411e684ffdf247a781c2ef534e6e6985fb65d2 100644 |
--- a/mojo/public/dart/mojo/lib/src/drain_data.dart |
+++ b/mojo/public/dart/mojo/lib/src/drain_data.dart |
@@ -6,12 +6,12 @@ part of core; |
class DataPipeDrainer { |
MojoDataPipeConsumer _consumer; |
- MojoEventStream _eventStream; |
+ MojoEventHandler _eventHandler; |
List<ByteData> _dataList; |
int _dataSize; |
DataPipeDrainer(this._consumer) { |
- _eventStream = new MojoEventStream(_consumer.handle); |
+ _eventHandler = new MojoEventHandler(_consumer.handle); |
_dataList = new List(); |
_dataSize = 0; |
} |
@@ -43,20 +43,20 @@ class DataPipeDrainer { |
Future<ByteData> drain() { |
var completer = new Completer(); |
- _eventStream.listen((List<int> event) { |
+ _eventHandler.handleEvents((List<int> event) { |
var mojoSignals = new MojoHandleSignals(event[1]); |
if (mojoSignals.isReadable) { |
var result = _doRead(); |
if (!result.isOk) { |
- _eventStream.close(); |
- _eventStream = null; |
+ _eventHandler.close(); |
+ _eventHandler = null; |
completer.complete(_concatData()); |
} else { |
- _eventStream.enableReadEvents(); |
+ _eventHandler.enableReadEvents(); |
} |
} else if (mojoSignals.isPeerClosed) { |
- _eventStream.close(); |
- _eventStream = null; |
+ _eventHandler.close(); |
+ _eventHandler = null; |
completer.complete(_concatData()); |
} else { |
throw 'Unexpected handle event: $mojoSignals'; |