Mojo C++ bindings: extract code shared by different variants.

mojo/public/tools/bindings/generators/cpp_templates/module.cc.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 %}
 
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-private-field"
 #elif defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4056)
 #pragma warning(disable:4065)
 #pragma warning(disable:4756)
 #endif
 
 #include "{{variant_path}}.h"
 
 #include <math.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
-#include "mojo/public/cpp/bindings/lib/map_data_internal.h"
 #include "mojo/public/cpp/bindings/lib/message_builder.h"
 #include "mojo/public/cpp/bindings/lib/serialization_util.h"
 #include "mojo/public/cpp/bindings/lib/validate_params.h"
 #include "mojo/public/cpp/bindings/lib/validation_context.h"
 #include "mojo/public/cpp/bindings/lib/validation_errors.h"
-#include "mojo/public/cpp/bindings/lib/validation_util.h"
 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h"
 
 {%- if for_blink %}
 #include "mojo/public/cpp/bindings/lib/wtf_serialization.h"
 {%- endif %}
 
 {%- for header in extra_traits_headers %}
 #include "{{header}}"
 {%- endfor %}
 
 {%- for namespace in namespaces_as_array %}
 namespace {{namespace}} {
 {%- endfor %}
 {%- if variant %}
 namespace {{variant}} {
 {%- endif %}
 
 {#--- Constants #}
 {%- for constant in module.constants %}
 {%-   if not constant.kind|is_integral_kind %}
 const {{constant.kind|cpp_pod_type}} {{constant.name}} = {{constant|constant_value}};
 {%-   endif %}
 {%- endfor %}
 
-namespace internal {
-namespace {
-
-#pragma pack(push, 1)
-
-{#--- Interface parameter definitions #}
-{%- for interface in interfaces %}
-{%-   for method in interface.methods %}
-{%-     set method_name = "k%s_%s_Name"|format(interface.name, method.name) %}
-const uint32_t {{method_name}} = {{method.ordinal}};
-{%      set struct = method.param_struct %}
-{%      include "struct_declaration.tmpl" %}
-{%-     include "struct_definition.tmpl" %}
-{%-     if method.response_parameters != None %}
-{%-       set struct = method.response_param_struct %}
-{%        include "struct_declaration.tmpl" %}
-{%-       include "struct_definition.tmpl" %}
-{%-     endif %}
-{%-   endfor %}
-{%- endfor %}
-
-#pragma pack(pop)
-
-}  // namespace
-
-{#--- Struct definitions #}
-{%  for struct in structs %}
-{%-   if not struct|is_native_only_kind %}
-{%-     include "struct_definition.tmpl" %}
-{%-   endif %}
-{%- endfor %}
-
-{#--- Union definitions #}
-{%  for union in unions %}
-{%-   include "union_definition.tmpl" %}
-{%- endfor %}
-
-}  // namespace internal
-
 namespace {
 
 {#--- Interface parameter data view definitions #}
 {%- for interface in interfaces %}
 {%-   for method in interface.methods %}
 {%      set struct = method.param_struct %}
 {%      include "struct_data_view_declaration.tmpl" %}
 {%      include "struct_data_view_definition.tmpl" %}
 {%-     if method.response_parameters != None %}
 {%-       set struct = method.response_param_struct %}
@@ skipping 55 matching lines @@
 {%- endfor %}
 
 }  // namespace mojo
 
 
 #if defined(__clang__)
 #pragma clang diagnostic pop
 #elif defined(_MSC_VER)
 #pragma warning(pop)
 #endif