Dart: Refactor Stubs

mojo/dart/packages/mojo/lib/src/codec.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.
 
 part of bindings;
 
 int align(int size) =>
     size + ((kAlignment - (size & kAlignmentMask)) & kAlignmentMask);
 
 const int kAlignment = 8;
@@ skipping 200 matching lines @@
 
   void encodeInterface(
       Object interface, int offset, bool nullable) {
     if (interface == null) {
       encodeInvalideHandle(offset, nullable);
       // Set the version field to 0.
       encodeUint32(0, offset + kSerializedHandleSize);
       return;
     }
     if (interface is Stub) {
-      if (interface.isBound) {
+      if (interface.ctrl.isBound) {
         throw new MojoCodecError(
             'Cannot encode a bound stub for an interface');
       }
       var pipe = new core.MojoMessagePipe();
-      interface.bind(pipe.endpoints[0]);
+      interface.ctrl.bind(pipe.endpoints[0]);
       encodeMessagePipeHandle(pipe.endpoints[1], offset, nullable);
       // Set the version to the version in the stub.
-      encodeUint32(interface.version, offset + kSerializedHandleSize);
+      encodeUint32(interface.ctrl.version, offset + kSerializedHandleSize);
     } else if (interface is Proxy) {
       if (!interface.ctrl.isBound) {
         throw new MojoCodecError(
             'Cannot encode an unbound proxy for an interface');
       }
       if (!interface.ctrl.isOpen) {
         // Make sure that we are listening so that state for the proxy is
         // cleaned up when the message is sent and the handle is closed.
         interface.ctrl.beginHandlingEvents();
       }
@@ skipping 13 matching lines @@
     if (request is Proxy) {
       if (request.ctrl.isBound) {
         throw new MojoCodecError(
             'Cannot encode a bound proxy for an interface request');
       }
       var pipe = new core.MojoMessagePipe();
       request.ctrl.bind(pipe.endpoints[0]);
       request.ctrl.beginHandlingEvents();
       encodeMessagePipeHandle(pipe.endpoints[1], offset, nullable);
     } else if (request is Stub) {
-      if (!request.isBound) {
+      if (!request.ctrl.isBound) {
         throw new MojoCodecError(
             'Cannot encode an unbound stub for an interface request');
       }
-      if (!request.isOpen) {
+      if (!request.ctrl.isOpen) {
         // Make sure that we are listening so that state for the stub is
         // cleaned up when the message is sent and the handle is closed.
-        request.beginHandlingEvents();
+        request.ctrl.beginHandlingEvents();
       }
-      encodeMessagePipeHandle(request.endpoint, offset, nullable);
+      encodeMessagePipeHandle(request.ctrl.endpoint, offset, nullable);
       // Set the version to the current version of the stub.
-      encodeUint32(request.version, offset + kSerializedHandleSize);
+      encodeUint32(request.ctrl.version, offset + kSerializedHandleSize);
     }
   }
 
   void encodeNullPointer(int offset, bool nullable) {
     if (!nullable) {
       throw new MojoCodecError(
           'Cannot encode a null pointer for a non-nullable type');
     }
     _buffer.buffer.setUint64(_base + offset, 0, Endianness.LITTLE_ENDIAN);
   }
@@ skipping 839 matching lines @@
       throw new MojoCodecError(
           'Incorrect header for map. The size is incorrect.');
     }
     if (header.version != kMapStructHeader.version) {
       throw new MojoCodecError(
           'Incorrect header for map. The version is incorrect.');
     }
     return header;
   }
 }