| Index: lib/runtime/dart/_isolate_helper.js
|
| diff --git a/lib/runtime/dart/_isolate_helper.js b/lib/runtime/dart/_isolate_helper.js
|
| index b755db7f88d64ae799dd211fc3db416f0b13678e..aa4bb812d933fb296cd9887100ea88d325f7edbd 100644
|
| --- a/lib/runtime/dart/_isolate_helper.js
|
| +++ b/lib/runtime/dart/_isolate_helper.js
|
| @@ -33,7 +33,7 @@ var async = dart.import(async);
|
| class _Serializer extends core.Object {
|
| _Serializer(opts) {
|
| let serializeSendPorts = opts && 'serializeSendPorts' in opts ? opts.serializeSendPorts : true;
|
| - this.serializedObjectIds = new (core.Map$(dart.dynamic, core.int)).identity();
|
| + this.serializedObjectIds = new (core.Map$(core.Object, core.int)).identity();
|
| this[_serializeSendPorts] = dart.as(serializeSendPorts, core.bool);
|
| }
|
| serialize(x) {
|
| @@ -119,7 +119,7 @@ var async = dart.import(async);
|
| }
|
| serializeMap(x) {
|
| let serializeTearOff = dart.bind(this, 'serialize');
|
| - return ['map', x.keys[core.$map](dart.as(serializeTearOff, __CastType0))[core.$toList](), x.values[core.$map](dart.as(serializeTearOff, dart.functionType(dart.dynamic, [dart.dynamic])))[core.$toList]()];
|
| + return ['map', x.keys[core.$map](dart.as(serializeTearOff, __CastType0))[core.$toList](), x.values[core.$map](dart.as(serializeTearOff, dart.functionType(core.Object, [dart.bottom])))[core.$toList]()];
|
| }
|
| serializeJSObject(x) {
|
| if (!!x.constructor && x.constructor !== Object) {
|
| @@ -166,23 +166,23 @@ var async = dart.import(async);
|
| }
|
| dart.setSignature(_Serializer, {
|
| methods: () => ({
|
| - serialize: dart.functionType(dart.dynamic, [dart.dynamic]),
|
| - unsupported: dart.functionType(dart.void, [dart.dynamic], [core.String]),
|
| - makeRef: dart.functionType(dart.dynamic, [core.int]),
|
| - isPrimitive: dart.functionType(core.bool, [dart.dynamic]),
|
| - serializePrimitive: dart.functionType(dart.dynamic, [dart.dynamic]),
|
| - serializeByteBuffer: dart.functionType(dart.dynamic, [_native_typed_data.NativeByteBuffer]),
|
| - serializeTypedData: dart.functionType(dart.dynamic, [_native_typed_data.NativeTypedData]),
|
| - serializeJSIndexable: dart.functionType(dart.dynamic, [_interceptors.JSIndexable]),
|
| - serializeArray: dart.functionType(dart.dynamic, [_interceptors.JSArray]),
|
| - serializeArrayInPlace: dart.functionType(dart.dynamic, [_interceptors.JSArray]),
|
| - serializeMap: dart.functionType(dart.dynamic, [core.Map]),
|
| - serializeJSObject: dart.functionType(dart.dynamic, [_interceptors.JSObject]),
|
| - serializeWorkerSendPort: dart.functionType(dart.dynamic, [_WorkerSendPort]),
|
| - serializeJsSendPort: dart.functionType(dart.dynamic, [_NativeJsSendPort]),
|
| - serializeCapability: dart.functionType(dart.dynamic, [CapabilityImpl]),
|
| - serializeClosure: dart.functionType(dart.dynamic, [_js_helper.Closure]),
|
| - serializeDartObject: dart.functionType(dart.dynamic, [dart.dynamic])
|
| + serialize: dart.functionType(core.Object, [core.Object]),
|
| + unsupported: dart.functionType(dart.void, [core.Object], [core.String]),
|
| + makeRef: dart.functionType(core.Object, [core.int]),
|
| + isPrimitive: dart.functionType(core.bool, [core.Object]),
|
| + serializePrimitive: dart.functionType(core.Object, [core.Object]),
|
| + serializeByteBuffer: dart.functionType(core.Object, [_native_typed_data.NativeByteBuffer]),
|
| + serializeTypedData: dart.functionType(core.Object, [_native_typed_data.NativeTypedData]),
|
| + serializeJSIndexable: dart.functionType(core.Object, [_interceptors.JSIndexable]),
|
| + serializeArray: dart.functionType(core.Object, [_interceptors.JSArray]),
|
| + serializeArrayInPlace: dart.functionType(core.Object, [_interceptors.JSArray]),
|
| + serializeMap: dart.functionType(core.Object, [core.Map]),
|
| + serializeJSObject: dart.functionType(core.Object, [_interceptors.JSObject]),
|
| + serializeWorkerSendPort: dart.functionType(core.Object, [_WorkerSendPort]),
|
| + serializeJsSendPort: dart.functionType(core.Object, [_NativeJsSendPort]),
|
| + serializeCapability: dart.functionType(core.Object, [CapabilityImpl]),
|
| + serializeClosure: dart.functionType(core.Object, [_js_helper.Closure]),
|
| + serializeDartObject: dart.functionType(core.Object, [core.Object])
|
| })
|
| });
|
| let _adjustSendPorts = Symbol('_adjustSendPorts');
|
| @@ -379,32 +379,32 @@ var async = dart.import(async);
|
| }
|
| dart.setSignature(_Deserializer, {
|
| methods: () => ({
|
| - deserialize: dart.functionType(dart.dynamic, [dart.dynamic]),
|
| - isPrimitive: dart.functionType(core.bool, [dart.dynamic]),
|
| - deserializePrimitive: dart.functionType(dart.dynamic, [dart.dynamic]),
|
| - deserializeRef: dart.functionType(dart.dynamic, [dart.dynamic]),
|
| - deserializeByteBuffer: dart.functionType(_native_typed_data.NativeByteBuffer, [dart.dynamic]),
|
| - deserializeTypedData: dart.functionType(_native_typed_data.NativeTypedData, [dart.dynamic]),
|
| + deserialize: dart.functionType(core.Object, [core.Object]),
|
| + isPrimitive: dart.functionType(core.bool, [core.Object]),
|
| + deserializePrimitive: dart.functionType(core.Object, [core.Object]),
|
| + deserializeRef: dart.functionType(core.Object, [core.Object]),
|
| + deserializeByteBuffer: dart.functionType(_native_typed_data.NativeByteBuffer, [core.Object]),
|
| + deserializeTypedData: dart.functionType(_native_typed_data.NativeTypedData, [core.Object]),
|
| deserializeArrayInPlace: dart.functionType(core.List, [_interceptors.JSArray]),
|
| - deserializeFixed: dart.functionType(core.List, [dart.dynamic]),
|
| - deserializeExtendable: dart.functionType(core.List, [dart.dynamic]),
|
| - deserializeMutable: dart.functionType(core.List, [dart.dynamic]),
|
| - deserializeConst: dart.functionType(core.List, [dart.dynamic]),
|
| - deserializeMap: dart.functionType(core.Map, [dart.dynamic]),
|
| - deserializeSendPort: dart.functionType(isolate.SendPort, [dart.dynamic]),
|
| - deserializeRawSendPort: dart.functionType(isolate.SendPort, [dart.dynamic]),
|
| - deserializeJSObject: dart.functionType(dart.dynamic, [dart.dynamic]),
|
| - deserializeClosure: dart.functionType(core.Function, [dart.dynamic]),
|
| - deserializeDartObject: dart.functionType(dart.dynamic, [dart.dynamic])
|
| + deserializeFixed: dart.functionType(core.List, [core.Object]),
|
| + deserializeExtendable: dart.functionType(core.List, [core.Object]),
|
| + deserializeMutable: dart.functionType(core.List, [core.Object]),
|
| + deserializeConst: dart.functionType(core.List, [core.Object]),
|
| + deserializeMap: dart.functionType(core.Map, [core.Object]),
|
| + deserializeSendPort: dart.functionType(isolate.SendPort, [core.Object]),
|
| + deserializeRawSendPort: dart.functionType(isolate.SendPort, [core.Object]),
|
| + deserializeJSObject: dart.functionType(core.Object, [core.Object]),
|
| + deserializeClosure: dart.functionType(core.Function, [core.Object]),
|
| + deserializeDartObject: dart.functionType(core.Object, [core.Object])
|
| })
|
| });
|
| - let __CastType0 = dart.typedef('__CastType0', () => dart.functionType(dart.dynamic, [dart.dynamic]));
|
| + let __CastType0 = dart.typedef('__CastType0', () => dart.functionType(core.Object, [dart.bottom]));
|
| function _callInIsolate(isolate, func) {
|
| let result = isolate.eval(func);
|
| exports._globalState.topEventLoop.run();
|
| return result;
|
| }
|
| - dart.fn(_callInIsolate, () => dart.functionType(dart.dynamic, [_IsolateContext, core.Function]));
|
| + dart.fn(_callInIsolate, () => dart.functionType(core.Object, [_IsolateContext, core.Function]));
|
| let _activeJsAsyncCount = Symbol('_activeJsAsyncCount');
|
| function enterJsAsync() {
|
| let o = exports._globalState.topEventLoop;
|
| @@ -451,7 +451,7 @@ var async = dart.import(async);
|
| }
|
| exports._globalState.topEventLoop.run();
|
| }
|
| - dart.fn(startRootIsolate, dart.void, [dart.dynamic, dart.dynamic]);
|
| + dart.fn(startRootIsolate, dart.void, [core.Object, core.Object]);
|
| dart.copyProperties(exports, {
|
| get _globalState() {
|
| return dart.as(dart.globalState, _Manager);
|
| @@ -483,7 +483,7 @@ var async = dart.import(async);
|
| this[_nativeDetectEnvironment]();
|
| this.topEventLoop = new _EventLoop();
|
| this.isolates = new (core.Map$(core.int, _IsolateContext))();
|
| - this.managers = new (core.Map$(core.int, dart.dynamic))();
|
| + this.managers = new (core.Map$(core.int, core.Object))();
|
| if (this.isWorker) {
|
| this.mainManager = new _MainManagerStub();
|
| this[_nativeInitWorkerMessageHandler]();
|
| @@ -528,7 +528,7 @@ var async = dart.import(async);
|
| [_nativeInitWorkerMessageHandler]: dart.functionType(dart.void, []),
|
| maybeCloseWorker: dart.functionType(dart.void, [])
|
| }),
|
| - statics: () => ({_serializePrintMessage: dart.functionType(dart.dynamic, [dart.dynamic])}),
|
| + statics: () => ({_serializePrintMessage: dart.functionType(core.Object, [core.Object])}),
|
| names: ['_serializePrintMessage']
|
| });
|
| let _scheduledControlEvents = Symbol('_scheduledControlEvents');
|
| @@ -806,10 +806,10 @@ var async = dart.import(async);
|
| handleKill: dart.functionType(dart.void, [isolate.Capability, core.int]),
|
| addErrorListener: dart.functionType(dart.void, [isolate.SendPort]),
|
| removeErrorListener: dart.functionType(dart.void, [isolate.SendPort]),
|
| - handleUncaughtError: dart.functionType(dart.void, [dart.dynamic, core.StackTrace]),
|
| - eval: dart.functionType(dart.dynamic, [core.Function]),
|
| + handleUncaughtError: dart.functionType(dart.void, [core.Object, core.StackTrace]),
|
| + eval: dart.functionType(core.Object, [core.Function]),
|
| [_setGlobals]: dart.functionType(dart.void, []),
|
| - handleControlMessage: dart.functionType(dart.void, [dart.dynamic]),
|
| + handleControlMessage: dart.functionType(dart.void, [core.Object]),
|
| lookup: dart.functionType(RawReceivePortImpl, [core.int]),
|
| [_addRegistration]: dart.functionType(dart.void, [core.int, RawReceivePortImpl]),
|
| register: dart.functionType(dart.void, [core.int, RawReceivePortImpl]),
|
| @@ -881,7 +881,7 @@ var async = dart.import(async);
|
| }
|
| dart.setSignature(_EventLoop, {
|
| methods: () => ({
|
| - enqueue: dart.functionType(dart.void, [dart.dynamic, dart.dynamic, dart.dynamic]),
|
| + enqueue: dart.functionType(dart.void, [core.Object, core.Object, core.Object]),
|
| prequeue: dart.functionType(dart.void, [_IsolateEvent]),
|
| dequeue: dart.functionType(_IsolateEvent, []),
|
| checkOpenReceivePortsFromCommandLine: dart.functionType(dart.void, []),
|
| @@ -914,7 +914,7 @@ var async = dart.import(async);
|
| }
|
| }
|
| dart.setSignature(_MainManagerStub, {
|
| - methods: () => ({postMessage: dart.functionType(dart.void, [dart.dynamic])})
|
| + methods: () => ({postMessage: dart.functionType(dart.void, [core.Object])})
|
| });
|
| let _SPAWNED_SIGNAL = "spawned";
|
| let _SPAWN_FAILED_SIGNAL = "spawn failed";
|
| @@ -932,9 +932,9 @@ var async = dart.import(async);
|
| return !!self.postMessage;
|
| }
|
| });
|
| - let _MainFunction = dart.typedef('_MainFunction', () => dart.functionType(dart.dynamic, []));
|
| - let _MainFunctionArgs = dart.typedef('_MainFunctionArgs', () => dart.functionType(dart.dynamic, [dart.dynamic]));
|
| - let _MainFunctionArgsMessage = dart.typedef('_MainFunctionArgsMessage', () => dart.functionType(dart.dynamic, [dart.dynamic, dart.dynamic]));
|
| + let _MainFunction = dart.typedef('_MainFunction', () => dart.functionType(core.Object, []));
|
| + let _MainFunctionArgs = dart.typedef('_MainFunctionArgs', () => dart.functionType(core.Object, [dart.bottom]));
|
| + let _MainFunctionArgsMessage = dart.typedef('_MainFunctionArgsMessage', () => dart.functionType(core.Object, [dart.bottom, dart.bottom]));
|
| class IsolateNatives extends core.Object {
|
| static computeThisScript() {
|
| let currentScript = document.currentScript;
|
| @@ -1052,7 +1052,7 @@ var async = dart.import(async);
|
| dart.dsend(replyPort, 'send', msg);
|
| }), {onError: dart.fn(errorMessage => {
|
| dart.dsend(replyPort, 'send', [_SPAWN_FAILED_SIGNAL, errorMessage]);
|
| - }, dart.dynamic, [core.String])});
|
| + }, core.Object, [core.String])});
|
| }
|
| static _log(msg) {
|
| if (exports._globalState.isWorker) {
|
| @@ -1210,22 +1210,22 @@ var async = dart.import(async);
|
| computeThisScriptJsshell: dart.functionType(core.String, []),
|
| computeThisScriptD8: dart.functionType(core.String, []),
|
| computeThisScriptFromTrace: dart.functionType(core.String, []),
|
| - _getEventData: dart.functionType(dart.dynamic, [dart.dynamic]),
|
| - _processWorkerMessage: dart.functionType(dart.void, [dart.dynamic, dart.dynamic]),
|
| - handleSpawnWorkerRequest: dart.functionType(dart.dynamic, [dart.dynamic]),
|
| - _log: dart.functionType(dart.dynamic, [dart.dynamic]),
|
| - _consoleLog: dart.functionType(dart.void, [dart.dynamic]),
|
| - _getJSFunctionFromName: dart.functionType(dart.dynamic, [core.String]),
|
| + _getEventData: dart.functionType(core.Object, [core.Object]),
|
| + _processWorkerMessage: dart.functionType(dart.void, [core.Object, core.Object]),
|
| + handleSpawnWorkerRequest: dart.functionType(core.Object, [core.Object]),
|
| + _log: dart.functionType(core.Object, [core.Object]),
|
| + _consoleLog: dart.functionType(dart.void, [core.Object]),
|
| + _getJSFunctionFromName: dart.functionType(core.Object, [core.String]),
|
| _getJSFunctionName: dart.functionType(core.String, [core.Function]),
|
| - _allocate: dart.functionType(dart.dynamic, [dart.dynamic]),
|
| - spawnFunction: dart.functionType(async.Future$(core.List), [dart.functionType(dart.void, [dart.dynamic]), dart.dynamic, core.bool]),
|
| - spawnUri: dart.functionType(async.Future$(core.List), [core.Uri, core.List$(core.String), dart.dynamic, core.bool]),
|
| - spawn: dart.functionType(async.Future$(core.List), [core.String, core.String, core.List$(core.String), dart.dynamic, core.bool, core.bool, core.bool]),
|
| - _startWorker: dart.functionType(dart.void, [core.String, core.String, core.List$(core.String), dart.dynamic, core.bool, core.bool, isolate.SendPort, dart.functionType(dart.void, [core.String])]),
|
| - _startNonWorker: dart.functionType(dart.void, [core.String, core.String, core.List$(core.String), dart.dynamic, core.bool, core.bool, isolate.SendPort]),
|
| - _startIsolate: dart.functionType(dart.void, [core.Function, core.List$(core.String), dart.dynamic, core.bool, core.bool, isolate.SendPort]),
|
| - _spawnWorker: dart.functionType(dart.void, [dart.dynamic, core.String, core.List$(core.String), dart.dynamic, core.bool, core.bool, isolate.SendPort, dart.functionType(dart.void, [core.String])]),
|
| - workerOnError: dart.functionType(core.bool, [dart.dynamic, core.String, dart.functionType(dart.void, [core.String])])
|
| + _allocate: dart.functionType(core.Object, [core.Object]),
|
| + spawnFunction: dart.functionType(async.Future$(core.List), [dart.functionType(dart.void, [dart.bottom]), core.Object, core.bool]),
|
| + spawnUri: dart.functionType(async.Future$(core.List), [core.Uri, core.List$(core.String), core.Object, core.bool]),
|
| + spawn: dart.functionType(async.Future$(core.List), [core.String, core.String, core.List$(core.String), core.Object, core.bool, core.bool, core.bool]),
|
| + _startWorker: dart.functionType(dart.void, [core.String, core.String, core.List$(core.String), core.Object, core.bool, core.bool, isolate.SendPort, dart.functionType(dart.void, [core.String])]),
|
| + _startNonWorker: dart.functionType(dart.void, [core.String, core.String, core.List$(core.String), core.Object, core.bool, core.bool, isolate.SendPort]),
|
| + _startIsolate: dart.functionType(dart.void, [core.Function, core.List$(core.String), core.Object, core.bool, core.bool, isolate.SendPort]),
|
| + _spawnWorker: dart.functionType(dart.void, [core.Object, core.String, core.List$(core.String), core.Object, core.bool, core.bool, isolate.SendPort, dart.functionType(dart.void, [core.String])]),
|
| + workerOnError: dart.functionType(core.bool, [core.Object, core.String, dart.functionType(dart.void, [core.String])])
|
| }),
|
| names: ['computeThisScript', 'computeThisScriptJsshell', 'computeThisScriptD8', 'computeThisScriptFromTrace', '_getEventData', '_processWorkerMessage', 'handleSpawnWorkerRequest', '_log', '_consoleLog', '_getJSFunctionFromName', '_getJSFunctionName', '_allocate', 'spawnFunction', 'spawnUri', 'spawn', '_startWorker', '_startNonWorker', '_startIsolate', '_spawnWorker', 'workerOnError']
|
| });
|
| @@ -1287,7 +1287,7 @@ var async = dart.import(async);
|
| }
|
| _NativeJsSendPort[dart.implements] = () => [isolate.SendPort];
|
| dart.setSignature(_NativeJsSendPort, {
|
| - methods: () => ({send: dart.functionType(dart.void, [dart.dynamic])})
|
| + methods: () => ({send: dart.functionType(dart.void, [core.Object])})
|
| });
|
| class _WorkerSendPort extends _BaseSendPort {
|
| _WorkerSendPort(workerId, isolateId, receivePortId) {
|
| @@ -1315,7 +1315,7 @@ var async = dart.import(async);
|
| }
|
| _WorkerSendPort[dart.implements] = () => [isolate.SendPort];
|
| dart.setSignature(_WorkerSendPort, {
|
| - methods: () => ({send: dart.functionType(dart.void, [dart.dynamic])})
|
| + methods: () => ({send: dart.functionType(dart.void, [core.Object])})
|
| });
|
| let _handler = Symbol('_handler');
|
| class RawReceivePortImpl extends core.Object {
|
| @@ -1374,7 +1374,7 @@ var async = dart.import(async);
|
| methods: () => ({
|
| [_close]: dart.functionType(dart.void, []),
|
| close: dart.functionType(dart.void, []),
|
| - [_add]: dart.functionType(dart.void, [dart.dynamic])
|
| + [_add]: dart.functionType(dart.void, [core.Object])
|
| })
|
| });
|
| RawReceivePortImpl._nextFreeId = 1;
|
| @@ -1413,7 +1413,7 @@ var async = dart.import(async);
|
| dart.defineNamedConstructor(ReceivePortImpl, 'fromRawReceivePort');
|
| dart.setSignature(ReceivePortImpl, {
|
| methods: () => ({
|
| - listen: dart.functionType(async.StreamSubscription, [dart.functionType(dart.void, [dart.dynamic])], {nErro: core.Function, nDon: dart.functionType(dart.void, []), ancelOnErro: core.bool}),
|
| + listen: dart.functionType(async.StreamSubscription, [dart.functionType(dart.void, [dart.bottom])], {nErro: core.Function, nDon: dart.functionType(dart.void, []), ancelOnErro: core.bool}),
|
| close: dart.functionType(dart.void, [])
|
| })
|
| });
|
|
|