Added Dartium support for JS to Dart PortSync calls

lib/html/src/Isolates.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// DO NOT EDIT
-// Auto-generated dart:html library.
-
-#library('html');
-
-#import('dart:isolate');
-#import('dart:json');
-
-$!GENERATED_DART_FILES
-
-#source('../../dom/src/EventListener.dart');
-#source('../../dom/src/KeyLocation.dart');
-#source('../../dom/src/KeyName.dart');
-#source('../../dom/src/ReadyState.dart');
-#source('../../dom/src/_Collections.dart');
-#source('../../dom/src/_XMLHttpRequestUtils.dart');
-#source('../../html/src/IDBOpenDBRequest.dart');
-#source('../../html/src/Measurement.dart');
-#source('../../html/src/shared_FactoryProviders.dart');
-#source('../../html/src/frog_DOMImplementation.dart');
-#source('../../html/src/frog_FactoryProviders.dart');
-#source('../../html/src/frog_IDBKeyRangeFactoryProvider.dart');
-#source('../../html/src/frog_IDBOpenDBRequestImplementation.dart');
-#source('../../html/src/frog_LocationWrapper.dart');
-#source('../../dom/src/frog_TypedArrayFactoryProvider.dart');
-#source('../../html/src/_Testing.dart');
-#source('../../html/src/Device.dart');
-#source('../../dom/src/_ListIterators.dart');
-#source('../../dom/src/_Lists.dart');
-#source('../../isolate/serialization.dart');
-
-
-Window get window() native "return window;";
-_WindowImpl get _window() native "return window;";
-
-Document get document() native "return document;";
-
-_DocumentImpl get _document() native "return document;";
-
-Element query(String selector) => _document.query(selector);
-ElementList queryAll(String selector) => _document.queryAll(selector);
-
-// Workaround for tags like <cite> that lack their own Element subclass --
-// Dart issue 1990.
-class _HTMLElementImpl extends _ElementImpl native "*HTMLElement" {
-}
-
-// TODO(vsm): Move this to a separate Isolates.dart file.
 _serialize(var message) {
   return new _JsSerializer().traverse(message);
 }
 
 class _JsSerializer extends _Serializer {
 
   visitSendPortSync(SendPortSync x) {
     if (x is _JsSendPortSync) return visitJsSendPortSync(x);
     if (x is _LocalSendPortSync) return visitLocalSendPortSync(x);
     if (x is _RemoteSendPortSync) return visitRemoteSendPortSync(x);
     throw "Illegal underlying port $x";
   }
 
   visitJsSendPortSync(_JsSendPortSync x) {
     return [ 'sendport', 'nativejs', x._id ];
   }
 
   visitLocalSendPortSync(_LocalSendPortSync x) {
-    return [ 'sendport', 'dart2js',
+    return [ 'sendport', 'dart',
              ReceivePortSync._isolateId, x._receivePort._portId ];
   }
 
   visitRemoteSendPortSync(_RemoteSendPortSync x) {
-    return [ 'sendport', 'dart2js',
+    return [ 'sendport', 'dart',
              x._receivePort._isolateId, x._receivePort._portId ];
   }
 }
 
 _deserialize(var message) {
   return new _JsDeserializer().deserialize(message);
 }
 
 class _JsDeserializer extends _Deserializer {
 
   deserializeSendPort(List x) {
     String tag = x[1];
     switch (tag) {
       case 'nativejs':
         num id = x[2];
         return new _JsSendPortSync(id);
-      case 'dart2js':
+      case 'dart':
         num isolateId = x[2];
         num portId = x[3];
         return ReceivePortSync._lookup(isolateId, portId);
       default:
         throw 'Illegal SendPortSync type: $tag';
     }
   }
 
 }
 
 // The receiver is JS.
 class _JsSendPortSync implements SendPortSync {
 
   num _id;
   _JsSendPortSync(this._id);
 
   callSync(var message) {
     var serialized = _serialize(message);
-    var result =
-        JS('var', @'ReceivePortSync.dispatchCall(#, #)', _id, serialized);
+    var result = _callPortSync(_id, serialized);
     return _deserialize(result);
   }
 
 }
 
-// TODO(vsm): Handle Dartium isolates.
+// TODO(vsm): Differentiate between Dart2Js and Dartium isolates.
 // The receiver is a different Dart isolate, compiled to JS.
 class _RemoteSendPortSync implements SendPortSync {
 
   int _isolateId;
   int _portId;
   _RemoteSendPortSync(this._isolateId, this._portId);
 
   callSync(var message) {
     var serialized = _serialize(message);
     var result = _call(_isolateId, _portId, serialized);
@@ skipping 31 matching lines @@
   }
 }
 
 // TODO(vsm): Move this to dart:isolate.  This will take some
 // refactoring as there are dependences here on the DOM.  Users
 // interact with this class (or interface if we change it) directly -
 // new ReceivePortSync.  I think most of the DOM logic could be
 // delayed until the corresponding SendPort is registered on the
 // window.
 
-// A Dart2JS ReceivePortSync (tagged 'dart2js' when serialized) is
+// A Dart ReceivePortSync (tagged 'dart' when serialized) is
 // identifiable / resolvable by the combination of its isolateid and
 // portid.  When a corresponding SendPort is used within the same
 // isolate, the _portMap below can be used to obtain the
 // ReceivePortSync directly.  Across isolates (or from JS), an
 // EventListener can be used to communicate with the port indirectly.
 class ReceivePortSync {
 
   static Map<int, ReceivePortSync> _portMap;
   static int _portIdCount;
   static int _cachedIsolateId;
@@ skipping 12 matching lines @@
   }
 
   static int get _isolateId() {
     // TODO(vsm): Make this coherent with existing isolate code.
     if (_cachedIsolateId == null) {
       _cachedIsolateId = _getNewIsolateId();      
     }
     return _cachedIsolateId;
   }
 
-  static int _getNewIsolateId() native @'''
-    if (!window.$dart$isolate$counter) {
-      window.$dart$isolate$counter = 1;
-    }
-    return window.$dart$isolate$counter++;
-''';
-
   static String _getListenerName(isolateId, portId) =>
       'dart-port-$isolateId-$portId'; 
   String get _listenerName() => _getListenerName(_isolateId, _portId);
 
   void receive(callback(var message)) {
     // Clear old listener.
     if (_callback != null) {
       window.on[_listenerName].remove(_listener);
     }
 
@@ skipping 27 matching lines @@
       return new _RemoteSendPortSync(isolateId, portId);
     }
   }
 }
 
 void _dispatchEvent(String receiver, var message) {
   var event = document.$dom_createEvent('TextEvent');
   event.initTextEvent(receiver, false, false, window, JSON.stringify(message));
   window.$dom_dispatchEvent(event);
 }