| Index: lib/runtime/dart/isolate.js
|
| diff --git a/lib/runtime/dart/isolate.js b/lib/runtime/dart/isolate.js
|
| index 914b3d736b050dfcb54ed2aae206ac08892dbc27..21f1fedb0ce10273092c3d5c287f0f85713c2e09 100644
|
| --- a/lib/runtime/dart/isolate.js
|
| +++ b/lib/runtime/dart/isolate.js
|
| @@ -4,7 +4,7 @@ dart_library.library('dart/isolate', null, /* Imports */[
|
| 'dart/async'
|
| ], /* Lazy imports */[
|
| 'dart/_isolate_helper'
|
| -], function(exports, dart, core, async, _isolate_helper) {
|
| +], function(exports, dart, core, $async, _isolate_helper) {
|
| 'use strict';
|
| let dartx = dart.dartx;
|
| class Capability extends core.Object {
|
| @@ -45,7 +45,7 @@ dart_library.library('dart/isolate', null, /* Imports */[
|
| return _isolate_helper.IsolateNatives.spawnFunction(entryPoint, message, paused).then(dart.fn(msg => new Isolate(dart.as(msg[dartx.get](1), SendPort), {pauseCapability: dart.as(msg[dartx.get](2), Capability), terminateCapability: dart.as(msg[dartx.get](3), Capability)}), Isolate, [core.List]));
|
| } catch (e) {
|
| let st = dart.stackTrace(e);
|
| - return async.Future$(Isolate).error(e, st);
|
| + return $async.Future$(Isolate).error(e, st);
|
| }
|
|
|
| }
|
| @@ -66,7 +66,7 @@ dart_library.library('dart/isolate', null, /* Imports */[
|
| return _isolate_helper.IsolateNatives.spawnUri(uri, args, message, paused).then(dart.fn(msg => new Isolate(dart.as(msg[dartx.get](1), SendPort), {pauseCapability: dart.as(msg[dartx.get](2), Capability), terminateCapability: dart.as(msg[dartx.get](3), Capability)}), Isolate, [core.List]));
|
| } catch (e) {
|
| let st = dart.stackTrace(e);
|
| - return async.Future$(Isolate).error(e, st);
|
| + return $async.Future$(Isolate).error(e, st);
|
| }
|
|
|
| }
|
| @@ -142,7 +142,7 @@ dart_library.library('dart/isolate', null, /* Imports */[
|
| controller.addError(error, error.stackTrace);
|
| }
|
| dart.fn(handleError, dart.void, [dart.dynamic]);
|
| - controller = async.StreamController.broadcast({sync: true, onListen: dart.fn((() => {
|
| + controller = $async.StreamController.broadcast({sync: true, onListen: dart.fn((() => {
|
| port = RawReceivePort.new(handleError);
|
| this.addErrorListener(port.sendPort);
|
| }).bind(this), dart.void, []), onCancel: dart.fn((() => {
|
| @@ -168,8 +168,8 @@ dart_library.library('dart/isolate', null, /* Imports */[
|
| removeErrorListener: [dart.void, [SendPort]]
|
| }),
|
| statics: () => ({
|
| - spawn: [async.Future$(Isolate), [dart.functionType(dart.void, [dart.dynamic]), dart.dynamic], {paused: core.bool}],
|
| - spawnUri: [async.Future$(Isolate), [core.Uri, core.List$(core.String), dart.dynamic], {paused: core.bool, packageRoot: core.Uri}]
|
| + spawn: [$async.Future$(Isolate), [dart.functionType(dart.void, [dart.dynamic]), dart.dynamic], {paused: core.bool}],
|
| + spawnUri: [$async.Future$(Isolate), [core.Uri, core.List$(core.String), dart.dynamic], {paused: core.bool, packageRoot: core.Uri}]
|
| }),
|
| names: ['spawn', 'spawnUri']
|
| });
|
| @@ -191,7 +191,7 @@ dart_library.library('dart/isolate', null, /* Imports */[
|
| return new _isolate_helper.ReceivePortImpl.fromRawReceivePort(rawPort);
|
| }
|
| }
|
| - ReceivePort[dart.implements] = () => [async.Stream];
|
| + ReceivePort[dart.implements] = () => [$async.Stream];
|
| dart.setSignature(ReceivePort, {
|
| constructors: () => ({
|
| new: [ReceivePort, []],
|
|
|