Mojo C++ bindings: remove support for generating code with mojo::Array/String/Map/WTFArray/WTFMap.

mojo/public/tools/bindings/generators/mojom_cpp_generator.py

 # Copyright 2013 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.
 
 """Generates C++ source files from a mojom.Module."""
 
 import mojom.generate.generator as generator
 import mojom.generate.module as mojom
 import mojom.generate.pack as pack
 from mojom.generate.template_expander import UseJinja
@@ skipping 18 matching lines @@
   mojom.UINT16:       "U",
   mojom.UINT32:       "U",
   mojom.FLOAT:        "f",
   mojom.UINT64:       "ULL",
 }
 
 # TODO(rockot): Get rid of these globals. This requires some refactoring of the
 # generator library code so that filters can use the generator as context.
 _current_typemap = {}
 _for_blink = False
-_use_new_wrapper_types = False
 # TODO(rockot, yzshen): The variant handling is kind of a hack currently. Make
 # it right.
 _variant = None
 
 
 class _NameFormatter(object):
   """A formatter for the names of kinds or values."""
 
   def __init__(self, token, variant):
     self._token = token
@@ skipping 85 matching lines @@
 
 # TODO(yzshen): Revisit the default value feature. It was designed prior to
 # custom type mapping.
 def DefaultValue(field):
   if field.default:
     if mojom.IsStructKind(field.kind):
       assert field.default == "default"
       if not IsTypemappedKind(field.kind):
         return "%s::New()" % GetNameForKind(field.kind)
     return ExpressionToText(field.default, kind=field.kind)
-  if not _use_new_wrapper_types:
-    if mojom.IsArrayKind(field.kind) or mojom.IsMapKind(field.kind):
-      return "nullptr";
-    if mojom.IsStringKind(field.kind):
-      return "" if _for_blink else "nullptr"
   return ""
 
 def NamespaceToArray(namespace):
   return namespace.split(".") if namespace else []
 
 def GetNameForKind(kind, internal=False, flatten_nested_kind=False,
                    add_same_module_namespaces=False):
   return _NameFormatter(kind, _variant).FormatForCpp(
       internal=internal, flatten_nested_kind=flatten_nested_kind,
       add_same_module_namespaces=add_same_module_namespaces)
@@ skipping 78 matching lines @@
            "nullable_is_same_type"]):
       type_name = _AddOptional(type_name)
     return type_name
   if mojom.IsEnumKind(kind):
     return GetNameForKind(
         kind, add_same_module_namespaces=add_same_module_namespaces)
   if mojom.IsStructKind(kind) or mojom.IsUnionKind(kind):
     return "%sPtr" % GetNameForKind(
         kind, add_same_module_namespaces=add_same_module_namespaces)
   if mojom.IsArrayKind(kind):
-    pattern = None
-    if _use_new_wrapper_types:
-      pattern = "WTF::Vector<%s>" if _for_blink else "std::vector<%s>"
-      if mojom.IsNullableKind(kind):
-        pattern = _AddOptional(pattern)
-    else:
-      pattern = "mojo::WTFArray<%s>" if _for_blink else "mojo::Array<%s>"
+    pattern = "WTF::Vector<%s>" if _for_blink else "std::vector<%s>"
+    if mojom.IsNullableKind(kind):
+      pattern = _AddOptional(pattern)
     return pattern % GetCppWrapperType(
         kind.kind, add_same_module_namespaces=add_same_module_namespaces)
   if mojom.IsMapKind(kind):
-    pattern = None
-    if _use_new_wrapper_types:
-      pattern = ("WTF::HashMap<%s, %s>" if _for_blink else
-                 "std::unordered_map<%s, %s>")
-      if mojom.IsNullableKind(kind):
-        pattern = _AddOptional(pattern)
-    else:
-      pattern = "mojo::WTFMap<%s, %s>" if _for_blink else "mojo::Map<%s, %s>"
+    pattern = ("WTF::HashMap<%s, %s>" if _for_blink else
+               "std::unordered_map<%s, %s>")
+    if mojom.IsNullableKind(kind):
+      pattern = _AddOptional(pattern)
     return pattern % (
         GetCppWrapperType(
             kind.key_kind,
             add_same_module_namespaces=add_same_module_namespaces),
         GetCppWrapperType(
             kind.value_kind,
             add_same_module_namespaces=add_same_module_namespaces))
   if mojom.IsInterfaceKind(kind):
     return "%sPtr" % GetNameForKind(
         kind, add_same_module_namespaces=add_same_module_namespaces)
   if mojom.IsInterfaceRequestKind(kind):
     return "%sRequest" % GetNameForKind(
         kind.kind, add_same_module_namespaces=add_same_module_namespaces)
   if mojom.IsAssociatedInterfaceKind(kind):
     return "%sAssociatedPtrInfo" % GetNameForKind(
         kind.kind, add_same_module_namespaces=add_same_module_namespaces)
   if mojom.IsAssociatedInterfaceRequestKind(kind):
     return "%sAssociatedRequest" % GetNameForKind(
         kind.kind, add_same_module_namespaces=add_same_module_namespaces)
   if mojom.IsStringKind(kind):
     if _for_blink:
       return "WTF::String"
-    if not _use_new_wrapper_types:
-      return "mojo::String"
     type_name = "std::string"
     return _AddOptional(type_name) if mojom.IsNullableKind(kind) else type_name
   if mojom.IsGenericHandleKind(kind):
     return "mojo::ScopedHandle"
   if mojom.IsDataPipeConsumerKind(kind):
     return "mojo::ScopedDataPipeConsumerHandle"
   if mojom.IsDataPipeProducerKind(kind):
     return "mojo::ScopedDataPipeProducerHandle"
   if mojom.IsMessagePipeKind(kind):
     return "mojo::ScopedMessagePipeHandle"
   if mojom.IsSharedBufferKind(kind):
     return "mojo::ScopedSharedBufferHandle"
   if not kind in _kind_to_cpp_type:
     raise Exception("Unrecognized kind %s" % kind.spec)
   return _kind_to_cpp_type[kind]
 
 def IsMoveOnlyKind(kind):
   if IsTypemappedKind(kind):
     if mojom.IsEnumKind(kind):
       return False
     return _current_typemap[GetFullMojomNameForKind(kind)]["move_only"]
   if mojom.IsStructKind(kind) or mojom.IsUnionKind(kind):
     return True
   if mojom.IsArrayKind(kind):
-    return IsMoveOnlyKind(kind.kind) if _use_new_wrapper_types else True
+    return IsMoveOnlyKind(kind.kind)
   if mojom.IsMapKind(kind):
-    return IsMoveOnlyKind(kind.value_kind) if _use_new_wrapper_types else True
+    return IsMoveOnlyKind(kind.value_kind)
   if mojom.IsAnyHandleOrInterfaceKind(kind):
     return True
   return False
 
 def IsCopyablePassByValue(kind):
   if not IsTypemappedKind(kind):
     return False
   return _current_typemap[GetFullMojomNameForKind(kind)][
       "copyable_pass_by_value"]
 
@@ skipping 287 matching lines @@
       "kinds": self.module.kinds,
       "enums": self.module.enums,
       "all_enums": all_enums,
       "structs": structs,
       "unions": self.GetUnions(),
       "interfaces": interfaces,
       "variant": self.variant,
       "extra_traits_headers": self.GetExtraTraitsHeaders(),
       "extra_public_headers": self.GetExtraPublicHeaders(),
       "for_blink": self.for_blink,
-      "use_new_wrapper_types": self.use_new_wrapper_types,
       "use_once_callback": self.use_once_callback,
       "export_attribute": self.export_attribute,
       "export_header": self.export_header,
     }
 
   @staticmethod
   def GetTemplatePrefix():
     return "cpp_templates"
 
   @classmethod
@@ skipping 27 matching lines @@
       self.Write(
           self.GenerateModuleSharedInternalHeader(),
           self.MatchMojomFilePath("%s-shared-internal.h" % self.module.name))
       self.Write(self.GenerateModuleSharedSource(),
                  self.MatchMojomFilePath("%s-shared.cc" % self.module.name))
     else:
       global _current_typemap
       _current_typemap = self.typemap
       global _for_blink
       _for_blink = self.for_blink
-      global _use_new_wrapper_types
-      _use_new_wrapper_types = self.use_new_wrapper_types
       global _use_once_callback
       _use_once_callback = self.use_once_callback
       global _variant
       _variant = self.variant
       suffix = "-%s" % self.variant if self.variant else ""
       self.Write(self.GenerateModuleHeader(),
                  self.MatchMojomFilePath("%s%s.h" % (self.module.name, suffix)))
       self.Write(
           self.GenerateModuleSource(),
           self.MatchMojomFilePath("%s%s.cc" % (self.module.name, suffix)))