Mojo C++ bindings: Merge EncodePointers/DecodePointers into Serialize/Deserialize, respectively.

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 124 matching lines @@
   return hasattr(kind, "name") and \
       GetFullMojomNameForKind(kind) in _current_typemap
 
 def IsNativeOnlyKind(kind):
   return (mojom.IsStructKind(kind) or mojom.IsEnumKind(kind)) and \
       kind.native_only
 
 def GetNativeTypeName(typemapped_kind):
   return _current_typemap[GetFullMojomNameForKind(typemapped_kind)]["typename"]
 
-def GetCppType(kind):
-  if mojom.IsArrayKind(kind):
-    return "mojo::internal::Array_Data<%s>*" % GetCppType(kind.kind)
-  if mojom.IsMapKind(kind):
-    return "mojo::internal::Map_Data<%s, %s>*" % (
-      GetCppType(kind.key_kind), GetCppType(kind.value_kind))
-  if mojom.IsStructKind(kind):
-    return "%s*" % GetNameForKind(kind, internal=True)
-  if mojom.IsUnionKind(kind):
-    return "%s" % GetNameForKind(kind, internal=True)
-  if mojom.IsInterfaceKind(kind):
-    return "mojo::internal::Interface_Data"
-  if mojom.IsInterfaceRequestKind(kind):
-    return "mojo::internal::Handle_Data"
-  if mojom.IsAssociatedInterfaceKind(kind):
-    return "mojo::internal::AssociatedInterface_Data"
-  if mojom.IsAssociatedInterfaceRequestKind(kind):
-    return "mojo::internal::AssociatedInterfaceRequest_Data"
-  if mojom.IsEnumKind(kind):
-    return "int32_t"
-  if mojom.IsStringKind(kind):
-    return "mojo::internal::String_Data*"
-  if mojom.IsAnyHandleKind(kind):
-    return "mojo::internal::Handle_Data"
-  return _kind_to_cpp_type[kind]
-
 def GetCppPodType(kind):
   if mojom.IsStringKind(kind):
     return "char*"
   return _kind_to_cpp_type[kind]
 
 def GetCppWrapperType(kind):
   if IsTypemappedKind(kind):
     return GetNativeTypeName(kind)
   if mojom.IsEnumKind(kind):
     return GetNameForKind(kind)
@@ skipping 43 matching lines @@
                            else "const %s&" % cpp_wrapper_type)
 
 def GetCppFieldType(kind):
   if mojom.IsStructKind(kind):
     return ("mojo::internal::Pointer<%s>" %
         GetNameForKind(kind, internal=True))
   if mojom.IsUnionKind(kind):
     return "%s" % GetNameForKind(kind, internal=True)
   if mojom.IsArrayKind(kind):
     return ("mojo::internal::Pointer<mojo::internal::Array_Data<%s>>" %
-            GetCppType(kind.kind))
+            GetCppFieldType(kind.kind))
   if mojom.IsMapKind(kind):
     return ("mojo::internal::Pointer<mojo::internal::Map_Data<%s, %s>>" %
-            (GetCppType(kind.key_kind), GetCppType(kind.value_kind)))
+            (GetCppFieldType(kind.key_kind), GetCppFieldType(kind.value_kind)))
   if mojom.IsInterfaceKind(kind):
     return "mojo::internal::Interface_Data"
   if mojom.IsInterfaceRequestKind(kind):
     return "mojo::internal::Handle_Data"
   if mojom.IsAssociatedInterfaceKind(kind):
     return "mojo::internal::AssociatedInterface_Data"
   if mojom.IsAssociatedInterfaceRequestKind(kind):
     return "mojo::internal::AssociatedInterfaceRequest_Data"
   if mojom.IsEnumKind(kind):
     return "int32_t"
   if mojom.IsStringKind(kind):
     return "mojo::internal::Pointer<mojo::internal::String_Data>"
   if mojom.IsAnyHandleKind(kind):
     return "mojo::internal::Handle_Data"
   return _kind_to_cpp_type[kind]
 
 def GetCppUnionFieldType(kind):
   if mojom.IsUnionKind(kind):
     return ("mojo::internal::Pointer<%s>" % GetNameForKind(kind, internal=True))
   return GetCppFieldType(kind)
 
 def GetUnionGetterReturnType(kind):
   if mojom.IsReferenceKind(kind):
     return "%s&" % GetCppWrapperType(kind)
   return GetCppWrapperType(kind)
 
-# TODO(yzshen): It is unfortunate that we have so many functions for returning
-# types. Refactor them.
 def GetUnmappedTypeForSerializer(kind):
   if mojom.IsEnumKind(kind):
     return GetQualifiedNameForKind(kind)
   if mojom.IsStructKind(kind) or mojom.IsUnionKind(kind):
     return "%sPtr" % GetQualifiedNameForKind(kind)
   if mojom.IsArrayKind(kind):
     return "mojo::Array<%s>" % GetUnmappedTypeForSerializer(kind.kind)
   if mojom.IsMapKind(kind):
     return "mojo::Map<%s, %s>" % (
         GetUnmappedTypeForSerializer(kind.key_kind),
@@ skipping 209 matching lines @@
     _for_blink = self.for_blink
     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.GenerateModuleInternalHeader(),
         self.MatchMojomFilePath("%s%s-internal.h" % (self.module.name, suffix)))
     self.Write(self.GenerateModuleSource(),
         self.MatchMojomFilePath("%s%s.cc" % (self.module.name, suffix)))