Revert "Maintain referential integrity of proxy instances in dart:js"

sdk/lib/js/dartium/js_dartium.dart

Index: sdk/lib/js/dartium/js_dartium.dart
diff --git a/sdk/lib/js/dartium/js_dartium.dart b/sdk/lib/js/dartium/js_dartium.dart
index 234a4bf3bff3f352481c7667dd5b22612853a160..a0c48ea0d93ed32372e0262d46effebb8c054aef 100644
--- a/sdk/lib/js/dartium/js_dartium.dart
+++ b/sdk/lib/js/dartium/js_dartium.dart
@@ -66,60 +66,16 @@
 
 library dart.js;
 
-import 'dart:collection' show HashMap;
 import 'dart:html';
 import 'dart:isolate';
 
 // Global ports to manage communication from Dart to JS.
-
 SendPortSync _jsPortSync = window.lookupPort('dart-js-context');
 SendPortSync _jsPortCreate = window.lookupPort('dart-js-create');
 SendPortSync _jsPortInstanceof = window.lookupPort('dart-js-instanceof');
 SendPortSync _jsPortDeleteProperty = window.lookupPort('dart-js-delete-property');
 SendPortSync _jsPortConvert = window.lookupPort('dart-js-convert');
 
-final String _objectIdPrefix = 'dart-obj-ref';
-final String _functionIdPrefix = 'dart-fun-ref';
-final _objectTable = new _ObjectTable();
-final _functionTable = new _ObjectTable.forFunctions();
-
-// Port to handle and forward requests to the underlying Dart objects.
-// A remote proxy is uniquely identified by an ID and SendPortSync.
-ReceivePortSync _port = new ReceivePortSync()
-    ..receive((msg) {
-      try {
-        var id = msg[0];
-        var method = msg[1];
-        if (method == '#call') {
-          var receiver = _getObjectTable(id).get(id);
-          var result;
-          if (receiver is Function) {
-            // remove the first argument, which is 'this', but never
-            // used for a raw function
-            var args = msg[2].sublist(1).map(_deserialize).toList();
-            result = Function.apply(receiver, args);
-          } else if (receiver is Callback) {
-            var args = msg[2].map(_deserialize).toList();
-            result = receiver._call(args);
-          } else {
-            throw new StateError('bad function type: $receiver');
-          }
-          return ['return', _serialize(result)];
-        } else {
-          // TODO(vsm): Support a mechanism to register a handler here.
-          throw 'Invocation unsupported on non-function Dart proxies';
-        }
-      } catch (e) {
-        // TODO(vsm): callSync should just handle exceptions itself.
-        return ['throws', '$e'];
-      }
-    });
-
-_ObjectTable _getObjectTable(String id) {
-  if (id.startsWith(_functionIdPrefix)) return _functionTable;
-  if (id.startsWith(_objectIdPrefix)) return _objectTable;
-  throw new ArgumentError('internal error: invalid object id: $id');
-}
 
 JsObject _context;
 
@@ -148,24 +104,21 @@ JsObject jsify(dynamic data) => data == null ? null : new JsObject._json(data);
  * JavaScript.
  */
 class Callback implements Serializable<JsFunction> {
-  final bool _withThis;
-  final Function _function;
-  JsFunction _jsFunction;
+  JsFunction _f;
 
-  Callback._(this._function, this._withThis) {
-    var id = _functionTable.add(this);
-    _jsFunction = new JsFunction._internal(_port.toSendPort(), id);
+  Callback._(Function f, bool withThis) {
+    final id = _proxiedObjectTable.add((List args) {
+      final arguments = new List.from(args);
+      if (!withThis) arguments.removeAt(0);
+      return Function.apply(f, arguments);
+    });
+    _f = new JsFunction._internal(_proxiedObjectTable.sendPort, id);
   }
 
   factory Callback(Function f) => new Callback._(f, false);
   factory Callback.withThis(Function f) => new Callback._(f, true);
 
-  dynamic _call(List args) {
-    var arguments = (_withThis) ? args : args.sublist(1);
-    return Function.apply(_function, arguments);
-  }
-
-  JsFunction toJs() => _jsFunction;
+  JsFunction toJs() => _f;
 }
 
 /**
@@ -289,47 +242,71 @@ abstract class Serializable<T> {
   T toJs();
 }
 
-class _ObjectTable {
-  final String name;
-  final Map<String, Object> objects;
-  final Map<Object, String> ids;
-  int nextId = 0;
-
-  // Creates a table that uses an identity Map to store IDs
-  _ObjectTable()
-    : name = _objectIdPrefix,
-      objects = new HashMap<String, Object>(),
-      ids = new HashMap<Object, String>.identity();
-
-  // Creates a table that uses an equality-based Map to store IDs, since
-  // closurized methods may be equal, but not identical
-  _ObjectTable.forFunctions()
-    : name = _functionIdPrefix,
-      objects = new HashMap<String, Object>(),
-      ids = new HashMap<Object, String>();
-
-  // Adds a new object to the table. If [id] is not given, a new unique ID is
-  // generated. Returns the ID.
-  String add(Object o, {String id}) {
+// A table to managed local Dart objects that are proxied in JavaScript.
+class _ProxiedObjectTable {
+  // Debugging name.
+  final String _name;
+
+  // Generator for unique IDs.
+  int _nextId;
+
+  // Table of IDs to Dart objects.
+  final Map<String, Object> _registry;
+
+  // Port to handle and forward requests to the underlying Dart objects.
+  // A remote proxy is uniquely identified by an ID and SendPortSync.
+  final ReceivePortSync _port;
+
+  _ProxiedObjectTable() :
+      _name = 'dart-ref',
+      _nextId = 0,
+      _registry = {},
+      _port = new ReceivePortSync() {
+    _port.receive((msg) {
+      try {
+        final receiver = _registry[msg[0]];
+        final method = msg[1];
+        final args = msg[2].map(_deserialize).toList();
+        if (method == '#call') {
+          final func = receiver as Function;
+          var result = _serialize(func(args));
+          return ['return', result];
+        } else {
+          // TODO(vsm): Support a mechanism to register a handler here.
+          throw 'Invocation unsupported on non-function Dart proxies';
+        }
+      } catch (e) {
+        // TODO(vsm): callSync should just handle exceptions itself.
+        return ['throws', '$e'];
+      }
+    });
+  }
+
+  // Adds a new object to the table and return a new ID for it.
+  String add(x) {
     // TODO(vsm): Cache x and reuse id.
-    if (id == null) id = ids[o];
-    if (id == null) id = '$name-${nextId++}';
-    ids[o] = id;
-    objects[id] = o;
+    final id = '$_name-${_nextId++}';
+    _registry[id] = x;
     return id;
   }
 
   // Gets an object by ID.
-  Object get(String id) => objects[id];
-
-  bool contains(String id) => objects.containsKey(id);
-
-  String getId(Object o) => ids[o];
+  Object get(String id) {
+    return _registry[id];
+  }
 
   // Gets the current number of objects kept alive by this table.
-  get count => objects.length;
+  get count => _registry.length;
+
+  // Gets a send port for this table.
+  get sendPort => _port.toSendPort();
 }
 
+// The singleton to manage proxied Dart objects.
+_ProxiedObjectTable _proxiedObjectTable = new _ProxiedObjectTable();
+
+/// End of proxy implementation.
+
 // Dart serialization support.
 
 _serialize(var message) {
@@ -345,23 +322,20 @@ _serialize(var message) {
     return message;
   } else if (message is JsFunction) {
     // Remote function proxy.
-    return ['funcref', message._id, message._port];
+    return [ 'funcref', message._id, message._port ];
   } else if (message is JsObject) {
     // Remote object proxy.
-    return ['objref', message._id, message._port];
+    return [ 'objref', message._id, message._port ];
   } else if (message is Serializable) {
     // use of result of toJs()
     return _serialize(message.toJs());
   } else if (message is Function) {
-    var id = _functionTable.getId(message);
-    if (id != null) {
-      return ['funcref', id, _port.toSendPort()];
-    }
-    id = _functionTable.add(message);
-    return ['funcref', id, _port.toSendPort()];
+    return _serialize(new Callback(message));
   } else {
     // Local object proxy.
-    return ['objref', _objectTable.add(message), _port.toSendPort()];
+    return [ 'objref',
+             _proxiedObjectTable.add(message),
+             _proxiedObjectTable.sendPort ];
   }
 }
 
@@ -369,34 +343,24 @@ _deserialize(var message) {
   deserializeFunction(message) {
     var id = message[1];
     var port = message[2];
-    if (port == _port.toSendPort()) {
+    if (port == _proxiedObjectTable.sendPort) {
       // Local function.
-      return _functionTable.get(id);
+      return _proxiedObjectTable.get(id);
     } else {
-      // Remote function.
-      var jsFunction = _functionTable.get(id);
-      if (jsFunction == null) {
-        jsFunction = new JsFunction._internal(port, id);
-        _functionTable.add(jsFunction, id: id);
-      }
-      return jsFunction;
+      // Remote function.  Forward to its port.
+      return new JsFunction._internal(port, id);
     }
   }
 
   deserializeObject(message) {
     var id = message[1];
     var port = message[2];
-    if (port == _port.toSendPort()) {
+    if (port == _proxiedObjectTable.sendPort) {
       // Local object.
-      return _objectTable.get(id);
+      return _proxiedObjectTable.get(id);
     } else {
       // Remote object.
-      var jsObject = _objectTable.get(id);
-      if (jsObject == null) {
-        jsObject = new JsObject._internal(port, id);
-        _objectTable.add(jsObject, id: id);
-      }
-      return jsObject;
+      return new JsObject._internal(port, id);
     }
   }