| Index: sdk/lib/async/merge_stream.dart
|
| diff --git a/sdk/lib/async/merge_stream.dart b/sdk/lib/async/merge_stream.dart
|
| index 9d7b0c31b9ded831f1c59e706856687839b32af5..2a9d273e2cd76dfac4312efc91e4581bf38dd841 100644
|
| --- a/sdk/lib/async/merge_stream.dart
|
| +++ b/sdk/lib/async/merge_stream.dart
|
| @@ -34,13 +34,13 @@ class _SupercedeEntry<T> {
|
| assert(subscription == null);
|
| if (!isDone) {
|
| subscription =
|
| - source.subscribe(onData: onData, onError: onError, onDone: onDone);
|
| + source.listen(onData, onError: onError, onDone: onDone);
|
| }
|
| }
|
|
|
| void stop() {
|
| if (!isDone) {
|
| - subscription.unsubscribe();
|
| + subscription.cancel();
|
| subscription = null;
|
| }
|
| }
|
| @@ -164,10 +164,10 @@ class _CycleEntry<T> {
|
|
|
| _CycleEntry(this.stream, this.source);
|
|
|
| - void unsubscribe() {
|
| + void cancel() {
|
| // This method may be called event if this entry has never been activated.
|
| if (subscription != null) {
|
| - subscription.unsubscribe();
|
| + subscription.cancel();
|
| subscription = null;
|
| }
|
| }
|
| @@ -189,9 +189,9 @@ class _CycleEntry<T> {
|
| void ensureSubscribed() {
|
| if (subscription == null) {
|
| subscription =
|
| - source.subscribe(onData: stream._onData,
|
| - onError: stream._signalError,
|
| - onDone: stream._onDone);
|
| + source.listen(stream._onData,
|
| + onError: stream._signalError,
|
| + onDone: stream._onDone);
|
| }
|
| }
|
| }
|
| @@ -242,7 +242,7 @@ class CyclicScheduleStream<T> extends _MultiStreamImpl<T> {
|
| return;
|
| }
|
| for (_CycleEntry entry = _currentEntry; entry != null; entry = entry.next) {
|
| - entry.unsubscribe();
|
| + entry.cancel();
|
| }
|
| }
|
|
|
|
|