Mojo C++ bindings: share DataView class between chromium and blink variants.

mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl

 // 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.
 
 {%- if variant -%}
 {%-   set variant_path = "%s-%s"|format(module.path, variant) -%}
 {%- else -%}
 {%-   set variant_path = module.path -%}
 {%- endif -%}
 
@@ skipping 12 matching lines @@
 
 {%- macro namespace_end() %}
 {%-   if variant %}
 }  // namespace {{variant}}
 {%-   endif %}
 {%-   for namespace in namespaces_as_array|reverse %}
 }  // namespace {{namespace}}
 {%-   endfor %}
 {%- endmacro %}
 
-{%- macro data_view_traits(kind) %}
-namespace mojo {
-namespace internal {
-template <>
-struct DataViewTraits<{{kind|get_qualified_name_for_kind}}DataView> {
-  using MojomType = {{kind|get_qualified_name_for_kind}}Ptr;
-};
-}  // namespace internal
-}  // namespace mojo
-{%- endmacro %}
-
 #ifndef {{header_guard}}
 #define {{header_guard}}
 
 #include <stdint.h>
 
 #include <type_traits>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/optional.h"
-#include "mojo/public/cpp/bindings/array_data_view.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/associated_interface_request.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/lib/control_message_handler.h"
 #include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
 #include "mojo/public/cpp/bindings/lib/serialization.h"
 #include "mojo/public/cpp/bindings/lib/union_accessor.h"
 #include "mojo/public/cpp/bindings/map.h"
-#include "mojo/public/cpp/bindings/map_data_view.h"
 #include "mojo/public/cpp/bindings/message_filter.h"
 #include "mojo/public/cpp/bindings/native_struct.h"
-#include "mojo/public/cpp/bindings/native_struct_data_view.h"
 #include "mojo/public/cpp/bindings/no_interface.h"
-#include "mojo/public/cpp/bindings/string_data_view.h"
 #include "mojo/public/cpp/bindings/struct_ptr.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
 #include "mojo/public/cpp/bindings/union_traits.h"
 #include "{{module.path}}-shared.h"
 {%- for import in imports %}
 {%-   if variant %}
 #include "{{"%s-%s.h"|format(import.module.path, variant)}}"
 {%-   else %}
 #include "{{import.module.path}}.h"
 {%-   endif %}
@@ skipping 18 matching lines @@
 
 {{namespace_begin()}}
 
 {#--- Enums #}
 {%- if variant %}
 {%-   for enum in enums %}
 using {{enum.name}} = {{enum.name}};  // Alias for definition in the parent namespace.
 {%-   endfor %}
 {%- endif %}
 
-
 {#--- Constants #}
 {%- for constant in module.constants %}
 {#-   To be consistent with constants defined inside interfaces, only make
       integral types compile-time constants. #}
 {%-   if constant.kind|is_integral_kind %}
 const {{constant.kind|cpp_pod_type}} {{constant.name}} = {{constant|constant_value}};
 {%-   else %}
 extern const {{constant.kind|cpp_pod_type}} {{constant.name}};
 {%-   endif %}
 {%- endfor %}
 
 {#--- Interface Forward Declarations -#}
 {%  for interface in interfaces %}
 class {{interface.name}};
 using {{interface.name}}Ptr = mojo::InterfacePtr<{{interface.name}}>;
 using {{interface.name}}PtrInfo = mojo::InterfacePtrInfo<{{interface.name}}>;
 using {{interface.name}}Request = mojo::InterfaceRequest<{{interface.name}}>;
 using {{interface.name}}AssociatedPtr =
     mojo::AssociatedInterfacePtr<{{interface.name}}>;
 using {{interface.name}}AssociatedPtrInfo =
     mojo::AssociatedInterfacePtrInfo<{{interface.name}}>;
 using {{interface.name}}AssociatedRequest =
     mojo::AssociatedInterfaceRequest<{{interface.name}}>;
 {%  endfor %}
 
 {#--- Struct Forward Declarations -#}
 {%  for struct in structs %}
 {%-   if struct|is_native_only_kind %}
 using {{struct.name}} = mojo::NativeStruct;
-using {{struct.name}}DataView = mojo::NativeStructDataView;
 using {{struct.name}}Ptr = mojo::NativeStructPtr;
 {%-   else %}
 class {{struct.name}};
-class {{struct.name}}DataView;
 {%-     if struct|should_inline %}
 using {{struct.name}}Ptr = mojo::InlinedStructPtr<{{struct.name}}>;
 {%-     else %}
 using {{struct.name}}Ptr = mojo::StructPtr<{{struct.name}}>;
 {%-     endif %}
 {%-   endif %}
 {%  endfor %}
 
 {#--- Union Forward Declarations -#}
 {%  for union in unions %}
 class {{union.name}};
-class {{union.name}}DataView;
 {%    if union|should_inline_union %}
 typedef mojo::InlinedStructPtr<{{union.name}}> {{union.name}}Ptr;
 {%    else %}
 typedef mojo::StructPtr<{{union.name}}> {{union.name}}Ptr;
 {%    endif %}
 {%- endfor %}
 
 {#--- Interfaces -#}
 {%  for interface in interfaces %}
 {%    include "interface_declaration.tmpl" %}
@@ skipping 19 matching lines @@
 {%    include "interface_response_validator_declaration.tmpl" %}
 {%- endfor %}
 
 {#--- NOTE: Unions and non-inlined structs may have pointers to inlined structs,
       so we need to fully define inlined structs ahead of the others. #}
 
 {#--- Inlined structs #}
 {%  for struct in structs %}
 {%    if struct|should_inline and not struct|is_native_only_kind %}
 {%      include "wrapper_class_declaration.tmpl" %}
-{%      include "struct_data_view_declaration.tmpl" %}
-
-{{namespace_end()}}
-{{data_view_traits(struct)}}
-{{namespace_begin()}}
-
 {%    endif %}
 {%- endfor %}
 
 {#--- Unions must be declared before non-inlined structs because they can be
       members of structs. #}
 {#--- Unions #}
 {%  for union in unions %}
 {%    include "wrapper_union_class_declaration.tmpl" %}
-{%    include "union_data_view_declaration.tmpl" %}
-
-{{namespace_end()}}
-{{data_view_traits(union)}}
-{{namespace_begin()}}
-
 {%- endfor %}
 
 {#--- Non-inlined structs #}
 {%  for struct in structs %}
 {%    if not struct|should_inline and not struct|is_native_only_kind %}
 {%      include "wrapper_class_declaration.tmpl" %}
-{%      include "struct_data_view_declaration.tmpl" %}
-
-{{namespace_end()}}
-{{data_view_traits(struct)}}
-{{namespace_begin()}}
-
 {%    endif %}
 {%- endfor %}
 
 {%- for union in unions %}
 {%    include "wrapper_union_class_template_definition.tmpl" %}
-{%    include "union_data_view_definition.tmpl" %}
 {%- endfor %}
 
 {%- for struct in structs %}
 {%-   if not struct|is_native_only_kind %}
 {%      include "wrapper_class_template_definition.tmpl" %}
-{%      include "struct_data_view_definition.tmpl" %}
 {%-   endif %}
 {%- endfor %}
 
 {{namespace_end()}}
 
 namespace mojo {
 
 {#--- Struct Serialization Helpers -#}
 {%  for struct in structs %}
 {%-   if not struct|is_native_only_kind %}
-{%      include "struct_serialization_declaration.tmpl" %}
+{%      include "struct_traits_declaration.tmpl" %}
 {%-   endif %}
 {%- endfor %}
 
 {#--- Union Serialization Helpers -#}
 {%  if unions %}
 {%-   for union in unions %}
-{%      include "union_serialization_declaration.tmpl" %}
+{%      include "union_traits_declaration.tmpl" %}
 {%-   endfor %}
 {%- endif %}
 
 }  // namespace mojo
 
 #endif  // {{header_guard}}