Dart: Refactors Proxies

mojo/dart/packages/mojo_services/lib/mojo/surfaces.mojom.dart

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 library surfaces_mojom;
 import 'dart:async';
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
 import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
 import 'package:mojo_services/mojo/geometry.mojom.dart' as geometry_mojom;
@@ skipping 1244 matching lines @@
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class ResourceReturner {
   static const String serviceName = null;
   void returnResources(List<ReturnedResource> resources);
 }
 
 
-class _ResourceReturnerProxyImpl extends bindings.Proxy {
-  _ResourceReturnerProxyImpl.fromEndpoint(
+class _ResourceReturnerProxyControl extends bindings.ProxyMessageHandler
+                                      implements bindings.ProxyControl {
+  _ResourceReturnerProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
-  _ResourceReturnerProxyImpl.fromHandle(core.MojoHandle handle) :
-      super.fromHandle(handle);
+  _ResourceReturnerProxyControl.fromHandle(
+      core.MojoHandle handle) : super.fromHandle(handle);
 
-  _ResourceReturnerProxyImpl.unbound() : super.unbound();
-
-  static _ResourceReturnerProxyImpl newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For _ResourceReturnerProxyImpl"));
-    return new _ResourceReturnerProxyImpl.fromEndpoint(endpoint);
-  }
+  _ResourceReturnerProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
-    new _ResourceReturnerServiceDescription();
+      new _ResourceReturnerServiceDescription();
 
+  String get serviceName => ResourceReturner.serviceName;
+
+  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "_ResourceReturnerProxyImpl($superString)";
+    return "_ResourceReturnerProxyControl($superString)";
   }
 }
 
 
-class _ResourceReturnerProxyCalls implements ResourceReturner {
-  _ResourceReturnerProxyImpl _proxyImpl;
+class ResourceReturnerProxy extends bindings.Proxy
+                              implements ResourceReturner {
+  ResourceReturnerProxy.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint)
+      : super(new _ResourceReturnerProxyControl.fromEndpoint(endpoint));
 
-  _ResourceReturnerProxyCalls(this._proxyImpl);
-    void returnResources(List<ReturnedResource> resources) {
-      if (!_proxyImpl.isBound) {
-        _proxyImpl.proxyError("The Proxy is closed.");
-        return;
-      }
-      var params = new _ResourceReturnerReturnResourcesParams();
-      params.resources = resources;
-      _proxyImpl.sendMessage(params, _resourceReturnerMethodReturnResourcesName);
-    }
-}
+  ResourceReturnerProxy.fromHandle(core.MojoHandle handle)
+      : super(new _ResourceReturnerProxyControl.fromHandle(handle));
 
+  ResourceReturnerProxy.unbound()
+      : super(new _ResourceReturnerProxyControl.unbound());
 
-class ResourceReturnerProxy implements bindings.ProxyBase {
-  final bindings.Proxy impl;
-  ResourceReturner ptr;
-
-  ResourceReturnerProxy(_ResourceReturnerProxyImpl proxyImpl) :
-      impl = proxyImpl,
-      ptr = new _ResourceReturnerProxyCalls(proxyImpl);
-
-  ResourceReturnerProxy.fromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) :
-      impl = new _ResourceReturnerProxyImpl.fromEndpoint(endpoint) {
-    ptr = new _ResourceReturnerProxyCalls(impl);
-  }
-
-  ResourceReturnerProxy.fromHandle(core.MojoHandle handle) :
-      impl = new _ResourceReturnerProxyImpl.fromHandle(handle) {
-    ptr = new _ResourceReturnerProxyCalls(impl);
-  }
-
-  ResourceReturnerProxy.unbound() :
-      impl = new _ResourceReturnerProxyImpl.unbound() {
-    ptr = new _ResourceReturnerProxyCalls(impl);
+  static ResourceReturnerProxy newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For ResourceReturnerProxy"));
+    return new ResourceReturnerProxy.fromEndpoint(endpoint);
   }
 
   factory ResourceReturnerProxy.connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     ResourceReturnerProxy p = new ResourceReturnerProxy.unbound();
     s.connectToService(url, p, serviceName);
     return p;
   }
 
-  static ResourceReturnerProxy newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For ResourceReturnerProxy"));
-    return new ResourceReturnerProxy.fromEndpoint(endpoint);
-  }
 
-  String get serviceName => ResourceReturner.serviceName;
-
-  Future close({bool immediate: false}) => impl.close(immediate: immediate);
-
-  Future responseOrError(Future f) => impl.responseOrError(f);
-
-  Future get errorFuture => impl.errorFuture;
-
-  int get version => impl.version;
-
-  Future<int> queryVersion() => impl.queryVersion();
-
-  void requireVersion(int requiredVersion) {
-    impl.requireVersion(requiredVersion);
-  }
-
-  String toString() {
-    return "ResourceReturnerProxy($impl)";
+  void returnResources(List<ReturnedResource> resources) {
+    if (!ctrl.isBound) {
+      ctrl.proxyError("The Proxy is closed.");
+      return;
+    }
+    var params = new _ResourceReturnerReturnResourcesParams();
+    params.resources = resources;
+    ctrl.sendMessage(params,
+        _resourceReturnerMethodReturnResourcesName);
   }
 }
 
 
 class ResourceReturnerStub extends bindings.Stub {
   ResourceReturner _impl;
 
   ResourceReturnerStub.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [ResourceReturner impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
@@ skipping 93 matching lines @@
 abstract class Surface {
   static const String serviceName = "mojo::Surface";
   dynamic getIdNamespace([Function responseFactory = null]);
   void setResourceReturner(Object returner);
   void createSurface(int idLocal);
   dynamic submitFrame(int idLocal,Frame frame,[Function responseFactory = null]);
   void destroySurface(int idLocal);
 }
 
 
-class _SurfaceProxyImpl extends bindings.Proxy {
-  _SurfaceProxyImpl.fromEndpoint(
+class _SurfaceProxyControl extends bindings.ProxyMessageHandler
+                                      implements bindings.ProxyControl {
+  _SurfaceProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
-  _SurfaceProxyImpl.fromHandle(core.MojoHandle handle) :
-      super.fromHandle(handle);
+  _SurfaceProxyControl.fromHandle(
+      core.MojoHandle handle) : super.fromHandle(handle);
 
-  _SurfaceProxyImpl.unbound() : super.unbound();
-
-  static _SurfaceProxyImpl newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For _SurfaceProxyImpl"));
-    return new _SurfaceProxyImpl.fromEndpoint(endpoint);
-  }
+  _SurfaceProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
-    new _SurfaceServiceDescription();
+      new _SurfaceServiceDescription();
 
+  String get serviceName => Surface.serviceName;
+
+  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _surfaceMethodGetIdNamespaceName:
         var r = SurfaceGetIdNamespaceResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
         Completer c = completerMap[message.header.requestId];
@@ skipping 29 matching lines @@
         }
         c.complete(r);
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "_SurfaceProxyImpl($superString)";
+    return "_SurfaceProxyControl($superString)";
   }
 }
 
 
-class _SurfaceProxyCalls implements Surface {
-  _SurfaceProxyImpl _proxyImpl;
+class SurfaceProxy extends bindings.Proxy
+                              implements Surface {
+  SurfaceProxy.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint)
+      : super(new _SurfaceProxyControl.fromEndpoint(endpoint));
 
-  _SurfaceProxyCalls(this._proxyImpl);
-    dynamic getIdNamespace([Function responseFactory = null]) {
-      var params = new _SurfaceGetIdNamespaceParams();
-      return _proxyImpl.sendMessageWithRequestId(
-          params,
-          _surfaceMethodGetIdNamespaceName,
-          -1,
-          bindings.MessageHeader.kMessageExpectsResponse);
-    }
-    void setResourceReturner(Object returner) {
-      if (!_proxyImpl.isBound) {
-        _proxyImpl.proxyError("The Proxy is closed.");
-        return;
-      }
-      var params = new _SurfaceSetResourceReturnerParams();
-      params.returner = returner;
-      _proxyImpl.sendMessage(params, _surfaceMethodSetResourceReturnerName);
-    }
-    void createSurface(int idLocal) {
-      if (!_proxyImpl.isBound) {
-        _proxyImpl.proxyError("The Proxy is closed.");
-        return;
-      }
-      var params = new _SurfaceCreateSurfaceParams();
-      params.idLocal = idLocal;
-      _proxyImpl.sendMessage(params, _surfaceMethodCreateSurfaceName);
-    }
-    dynamic submitFrame(int idLocal,Frame frame,[Function responseFactory = null]) {
-      var params = new _SurfaceSubmitFrameParams();
-      params.idLocal = idLocal;
-      params.frame = frame;
-      return _proxyImpl.sendMessageWithRequestId(
-          params,
-          _surfaceMethodSubmitFrameName,
-          -1,
-          bindings.MessageHeader.kMessageExpectsResponse);
-    }
-    void destroySurface(int idLocal) {
-      if (!_proxyImpl.isBound) {
-        _proxyImpl.proxyError("The Proxy is closed.");
-        return;
-      }
-      var params = new _SurfaceDestroySurfaceParams();
-      params.idLocal = idLocal;
-      _proxyImpl.sendMessage(params, _surfaceMethodDestroySurfaceName);
-    }
-}
+  SurfaceProxy.fromHandle(core.MojoHandle handle)
+      : super(new _SurfaceProxyControl.fromHandle(handle));
 
+  SurfaceProxy.unbound()
+      : super(new _SurfaceProxyControl.unbound());
 
-class SurfaceProxy implements bindings.ProxyBase {
-  final bindings.Proxy impl;
-  Surface ptr;
-
-  SurfaceProxy(_SurfaceProxyImpl proxyImpl) :
-      impl = proxyImpl,
-      ptr = new _SurfaceProxyCalls(proxyImpl);
-
-  SurfaceProxy.fromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) :
-      impl = new _SurfaceProxyImpl.fromEndpoint(endpoint) {
-    ptr = new _SurfaceProxyCalls(impl);
-  }
-
-  SurfaceProxy.fromHandle(core.MojoHandle handle) :
-      impl = new _SurfaceProxyImpl.fromHandle(handle) {
-    ptr = new _SurfaceProxyCalls(impl);
-  }
-
-  SurfaceProxy.unbound() :
-      impl = new _SurfaceProxyImpl.unbound() {
-    ptr = new _SurfaceProxyCalls(impl);
+  static SurfaceProxy newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For SurfaceProxy"));
+    return new SurfaceProxy.fromEndpoint(endpoint);
   }
 
   factory SurfaceProxy.connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     SurfaceProxy p = new SurfaceProxy.unbound();
     s.connectToService(url, p, serviceName);
     return p;
   }
 
-  static SurfaceProxy newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For SurfaceProxy"));
-    return new SurfaceProxy.fromEndpoint(endpoint);
+
+  dynamic getIdNamespace([Function responseFactory = null]) {
+    var params = new _SurfaceGetIdNamespaceParams();
+    return ctrl.sendMessageWithRequestId(
+        params,
+        _surfaceMethodGetIdNamespaceName,
+        -1,
+        bindings.MessageHeader.kMessageExpectsResponse);
   }
-
-  String get serviceName => Surface.serviceName;
-
-  Future close({bool immediate: false}) => impl.close(immediate: immediate);
-
-  Future responseOrError(Future f) => impl.responseOrError(f);
-
-  Future get errorFuture => impl.errorFuture;
-
-  int get version => impl.version;
-
-  Future<int> queryVersion() => impl.queryVersion();
-
-  void requireVersion(int requiredVersion) {
-    impl.requireVersion(requiredVersion);
+  void setResourceReturner(Object returner) {
+    if (!ctrl.isBound) {
+      ctrl.proxyError("The Proxy is closed.");
+      return;
+    }
+    var params = new _SurfaceSetResourceReturnerParams();
+    params.returner = returner;
+    ctrl.sendMessage(params,
+        _surfaceMethodSetResourceReturnerName);
   }
-
-  String toString() {
-    return "SurfaceProxy($impl)";
+  void createSurface(int idLocal) {
+    if (!ctrl.isBound) {
+      ctrl.proxyError("The Proxy is closed.");
+      return;
+    }
+    var params = new _SurfaceCreateSurfaceParams();
+    params.idLocal = idLocal;
+    ctrl.sendMessage(params,
+        _surfaceMethodCreateSurfaceName);
+  }
+  dynamic submitFrame(int idLocal,Frame frame,[Function responseFactory = null]) {
+    var params = new _SurfaceSubmitFrameParams();
+    params.idLocal = idLocal;
+    params.frame = frame;
+    return ctrl.sendMessageWithRequestId(
+        params,
+        _surfaceMethodSubmitFrameName,
+        -1,
+        bindings.MessageHeader.kMessageExpectsResponse);
+  }
+  void destroySurface(int idLocal) {
+    if (!ctrl.isBound) {
+      ctrl.proxyError("The Proxy is closed.");
+      return;
+    }
+    var params = new _SurfaceDestroySurfaceParams();
+    params.idLocal = idLocal;
+    ctrl.sendMessage(params,
+        _surfaceMethodDestroySurfaceName);
   }
 }
 
 
 class SurfaceStub extends bindings.Stub {
   Surface _impl;
 
   SurfaceStub.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [Surface impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
@@ skipping 129 matching lines @@
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _SurfaceServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }