Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/mojo_services/lib/mojo/surfaces.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/surfaces.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/surfaces.mojom.dart
index e332ade241fd74770cd32c53abb386e950039026..3c7946d6b0f78a8a56dd476369a97c110349f989 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/surfaces.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/surfaces.mojom.dart
@@ -8,10 +8,11 @@ import 'dart:async';
 
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
+import 'package:mojo/mojo/bindings/types/mojom_types.mojom.dart' as mojom_types;
+import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
 import 'package:mojo_services/mojo/geometry.mojom.dart' as geometry_mojom;
 import 'package:mojo_services/mojo/quads.mojom.dart' as quads_mojom;
 import 'package:mojo_services/mojo/surface_id.mojom.dart' as surface_id_mojom;
-
 class ResourceFormat extends bindings.MojoEnum {
   static const ResourceFormat rgba8888 = const ResourceFormat._(0);
   static const ResourceFormat rgba4444 = const ResourceFormat._(1);
@@ -91,6 +92,8 @@ class ResourceFormat extends bindings.MojoEnum {
         return 'ResourceFormat.rgb565';
       case etc1:
         return 'ResourceFormat.etc1';
+      default:
+        return null;
     }
   }
 
@@ -99,6 +102,8 @@ class ResourceFormat extends bindings.MojoEnum {
 
 
 
+
+
 class Mailbox extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -166,6 +171,8 @@ class Mailbox extends bindings.Struct {
 }
 
 
+
+
 class MailboxHolder extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
@@ -252,6 +259,8 @@ class MailboxHolder extends bindings.Struct {
 }
 
 
+
+
 class TransferableResource extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(40, 0)
@@ -379,6 +388,8 @@ class TransferableResource extends bindings.Struct {
 }
 
 
+
+
 class ReturnedResource extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
@@ -473,6 +484,8 @@ class ReturnedResource extends bindings.Struct {
 }
 
 
+
+
 class Frame extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
@@ -583,6 +596,8 @@ class Frame extends bindings.Struct {
 }
 
 
+
+
 class _ResourceReturnerReturnResourcesParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -667,6 +682,8 @@ class _ResourceReturnerReturnResourcesParams extends bindings.Struct {
 }
 
 
+
+
 class _SurfaceGetIdNamespaceParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
@@ -725,6 +742,8 @@ class _SurfaceGetIdNamespaceParams extends bindings.Struct {
 }
 
 
+
+
 class SurfaceGetIdNamespaceResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -792,6 +811,8 @@ class SurfaceGetIdNamespaceResponseParams extends bindings.Struct {
 }
 
 
+
+
 class _SurfaceSetResourceReturnerParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -858,6 +879,8 @@ class _SurfaceSetResourceReturnerParams extends bindings.Struct {
 }
 
 
+
+
 class _SurfaceCreateSurfaceParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -925,6 +948,8 @@ class _SurfaceCreateSurfaceParams extends bindings.Struct {
 }
 
 
+
+
 class _SurfaceSubmitFrameParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
@@ -1002,6 +1027,8 @@ class _SurfaceSubmitFrameParams extends bindings.Struct {
 }
 
 
+
+
 class SurfaceSubmitFrameResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
@@ -1060,6 +1087,8 @@ class SurfaceSubmitFrameResponseParams extends bindings.Struct {
 }
 
 
+
+
 class _SurfaceDestroySurfaceParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -1126,8 +1155,22 @@ class _SurfaceDestroySurfaceParams extends bindings.Struct {
   }
 }
 
+
+
+
 const int _ResourceReturner_returnResourcesName = 0;
 
+
+
+class _ResourceReturnerServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) => null;
+
+  dynamic getTypeDefinition(String typeKey, [Function responseFactory = null]) =>
+    null;
+
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) => null;
+}
+
 abstract class ResourceReturner {
   static const String serviceName = null;
   void returnResources(List<ReturnedResource> resources);
@@ -1149,6 +1192,9 @@ class _ResourceReturnerProxyImpl extends bindings.Proxy {
     return new _ResourceReturnerProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ResourceReturnerServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -1292,6 +1338,9 @@ class ResourceReturnerStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ResourceReturnerServiceDescription();
 }
 
 const int _Surface_getIdNamespaceName = 0;
@@ -1300,6 +1349,17 @@ const int _Surface_createSurfaceName = 2;
 const int _Surface_submitFrameName = 3;
 const int _Surface_destroySurfaceName = 4;
 
+
+
+class _SurfaceServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) => null;
+
+  dynamic getTypeDefinition(String typeKey, [Function responseFactory = null]) =>
+    null;
+
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) => null;
+}
+
 abstract class Surface {
   static const String serviceName = "mojo::Surface";
   dynamic getIdNamespace([Function responseFactory = null]);
@@ -1325,6 +1385,9 @@ class _SurfaceProxyImpl extends bindings.Proxy {
     return new _SurfaceProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _SurfaceServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _Surface_getIdNamespaceName:
@@ -1607,6 +1670,11 @@ class SurfaceStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _SurfaceServiceDescription();
 }
 
 
+
+