Index: mojo/dart/embedder/io/socket_patch.dart |
diff --git a/mojo/dart/embedder/io/socket_patch.dart b/mojo/dart/embedder/io/socket_patch.dart |
index d8a80fde6472aed86710f5211de0c214fff573a1..4c222cc794baf7062c4ba926046b7546a1ef9b0d 100644 |
--- a/mojo/dart/embedder/io/socket_patch.dart |
+++ b/mojo/dart/embedder/io/socket_patch.dart |
@@ -34,8 +34,8 @@ class _MojoRawSocket extends Stream<RawSocketEvent> implements RawSocket { |
bool _inClosed = false; |
bool _readEventsEnabled = true; |
bool _writeEventsEnabled = true; |
- MojoEventStream _pipeOutEvents; |
- MojoEventStream _pipeInEvents; |
+ MojoEventHandler _pipeOutEvents; |
+ MojoEventHandler _pipeInEvents; |
InternetAddress _localAddress; |
int _localPort; |
InternetAddress _remoteAddress; |
@@ -327,22 +327,18 @@ class _MojoRawSocket extends Stream<RawSocketEvent> implements RawSocket { |
_setupIn() { |
assert(_pipeInEvents == null); |
- _pipeInEvents = new MojoEventStream(_pipeIn.consumer.handle, |
+ _pipeInEvents = new MojoEventHandler(_pipeIn.consumer.handle, |
MojoHandleSignals.READABLE + |
MojoHandleSignals.PEER_CLOSED); |
- _pipeInEvents.listen(_onInputData, |
- onError: _onInputError, |
- onDone: _onInputDone); |
+ _pipeInEvents.handleEvents(_onInputData); |
} |
_setupOut() { |
assert(_pipeOutEvents == null); |
- _pipeOutEvents = new MojoEventStream(_pipeOut.producer.handle, |
+ _pipeOutEvents = new MojoEventHandler(_pipeOut.producer.handle, |
MojoHandleSignals.WRITABLE + |
MojoHandleSignals.PEER_CLOSED); |
- _pipeOutEvents.listen(_onOutputData, |
- onError: _onOutputError, |
- onDone: _onOutputDone); |
Cutch
2015/11/11 17:47:17
Who calls _onOutputError and _onOutputDone now?
zra
2015/11/11 18:44:33
These and _onInput{Error,Done} aren't needed anymo
|
+ _pipeOutEvents.handleEvents(_onOutputData); |
} |
_shutdownIn([bool force = false]) { |
@@ -498,7 +494,7 @@ class _MojoRawSocket extends Stream<RawSocketEvent> implements RawSocket { |
} |
- static _enableReadEvents(MojoEventStream stream) { |
+ static _enableReadEvents(MojoEventHandler stream) { |
if (stream == null) { |
return; |
} |
@@ -506,7 +502,7 @@ class _MojoRawSocket extends Stream<RawSocketEvent> implements RawSocket { |
MojoHandleSignals.READABLE); |
} |
- static _enableWriteEvents(MojoEventStream stream) { |
+ static _enableWriteEvents(MojoEventHandler stream) { |
if (stream == null) { |
return; |
} |
@@ -514,7 +510,7 @@ class _MojoRawSocket extends Stream<RawSocketEvent> implements RawSocket { |
MojoHandleSignals.WRITABLE); |
} |
- static _disableEvents(MojoEventStream stream) { |
+ static _disableEvents(MojoEventHandler stream) { |
if (stream == null) { |
return; |
} |