Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/mojo_services/lib/mojo/display.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/display.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/display.mojom.dart
index a8195cf0778b576d5cafb244b3b6da36db04f0cf..b6b753cbd27347f5281f07217797a6e831df9ff9 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/display.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/display.mojom.dart
@@ -5,9 +5,12 @@
 library display_mojom;
 
 import 'dart:async';
+import 'dart:collection';
 
 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/context_provider.mojom.dart' as context_provider_mojom;
 import 'package:mojo_services/mojo/viewport_parameter_listener.mojom.dart' as viewport_parameter_listener_mojom;
 import 'package:mojo_services/mojo/surfaces.mojom.dart' as surfaces_mojom;
@@ -80,6 +83,22 @@ class _DisplaySubmitFrameParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _display_Display_SubmitFrame_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_DisplaySubmitFrameParams'
+      ..fullIdentifier = 'mojo._DisplaySubmitFrameParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Frame')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_surfaces_Frame__'
+    ..typeKey = '_surfaces_Frame__'
+  )),
+      ];
+}
 
 
 class DisplaySubmitFrameResponseParams extends bindings.Struct {
@@ -138,6 +157,13 @@ class DisplaySubmitFrameResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _display_Display_SubmitFrame_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'DisplaySubmitFrameResponseParams'
+      ..fullIdentifier = 'mojo.DisplaySubmitFrameResponseParams')
+    ..fields = <mojom_types.StructField>[];
+}
 
 
 class _DisplayFactoryCreateParams extends bindings.Struct {
@@ -220,9 +246,73 @@ class _DisplayFactoryCreateParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _display_DisplayFactory_Create_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_DisplayFactoryCreateParams'
+      ..fullIdentifier = 'mojo._DisplayFactoryCreateParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ContextProvider')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_context_provider_ContextProvider__'
+    ..typeKey = '_context_provider_ContextProvider__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Returner')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+    ..nullable = true
+  
+  
+    ..identifier = '_surfaces_ResourceReturner__'
+    ..typeKey = '_surfaces_ResourceReturner__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'DisplayRequest')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..isInterfaceRequest = true
+    ..identifier = '_display_Display__'
+    ..typeKey = '_display_Display__'
+  )),
+      ];
+}
+
 
 const int _Display_submitFrameName = 0;
 
+mojom_types.MojomInterface _display_Display__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'Display'
+      ..fullIdentifier = 'mojo.Display')
+    ..interfaceName = 'Display'
+    ..methods = <int, mojom_types.MojomMethod>{
+_Display_submitFrameName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'SubmitFrame')
+        ..ordinal = _Display_submitFrameName
+        ..responseParams = _display_Display_SubmitFrame_ResponseParams__()..parameters = _display_Display_SubmitFrame_Params__(),
+    };
+}
+
+class _DisplayServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _display_Display__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class Display {
   static const String serviceName = null;
   dynamic submitFrame(surfaces_mojom.Frame frame,[Function responseFactory = null]);
@@ -244,6 +334,9 @@ class _DisplayProxyImpl extends bindings.Proxy {
     return new _DisplayProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _DisplayServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _Display_submitFrameName:
@@ -428,10 +521,39 @@ class DisplayStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _DisplayServiceDescription();
 }
 
 const int _DisplayFactory_createName = 0;
 
+mojom_types.MojomInterface _display_DisplayFactory__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'DisplayFactory'
+      ..fullIdentifier = 'mojo.DisplayFactory')
+    ..interfaceName = 'DisplayFactory'
+    ..methods = <int, mojom_types.MojomMethod>{
+_DisplayFactory_createName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Create')
+        ..ordinal = _DisplayFactory_createName..parameters = _display_DisplayFactory_Create_Params__(),
+    };
+}
+
+class _DisplayFactoryServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _display_DisplayFactory__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class DisplayFactory {
   static const String serviceName = "mojo::DisplayFactory";
   void create(Object contextProvider, Object returner, Object displayRequest);
@@ -453,6 +575,9 @@ class _DisplayFactoryProxyImpl extends bindings.Proxy {
     return new _DisplayFactoryProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _DisplayFactoryServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -598,6 +723,53 @@ class DisplayFactoryStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _DisplayFactoryServiceDescription();
+}
+
+
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_display_Display_SubmitFrame_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _display_Display_SubmitFrame_Params__();
+map["_display_Display_SubmitFrame_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _display_Display_SubmitFrame_ResponseParams__();
+map["_display_DisplayFactory_Create_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _display_DisplayFactory_Create_Params__();
+map["_display_Display__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _display_Display__();
+map["_display_DisplayFactory__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _display_DisplayFactory__();
+context_provider_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+viewport_parameter_listener_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+surfaces_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+
+  return map;
 }
 
+var _MojomDesc;
+Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
+  if (_MojomDesc == null) {
+    _MojomDesc = _initDescriptions();
+  }
+  return _MojomDesc;
+}