Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Side by Side Diff: mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl

Issue 1477643002: Remove the TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03 macro. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@basepass
Patch Set: type-with-move: no-media Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 {%- import "interface_macros.tmpl" as interface_macros %} 1 {%- import "interface_macros.tmpl" as interface_macros %}
2 {%- import "struct_macros.tmpl" as struct_macros %} 2 {%- import "struct_macros.tmpl" as struct_macros %}
3 {%- from "enum_macros.tmpl" import is_valid_enum_def %} 3 {%- from "enum_macros.tmpl" import is_valid_enum_def %}
4 4
5 {%- set class_name = interface.name %} 5 {%- set class_name = interface.name %}
6 {%- set proxy_name = interface.name ~ "Proxy" %} 6 {%- set proxy_name = interface.name ~ "Proxy" %}
7 {%- set namespace_as_string = "%s"|format(namespace|replace(".","::")) %} 7 {%- set namespace_as_string = "%s"|format(namespace|replace(".","::")) %}
8 8
9 {%- macro alloc_params(struct, serialization_context) %} 9 {%- macro alloc_params(struct, serialization_context) %}
10 {%- for param in struct.packed.packed_fields_in_ordinal_order %} 10 {%- for param in struct.packed.packed_fields_in_ordinal_order %}
11 {{param.field.kind|cpp_result_type}} p_{{param.field.name}}{}; 11 {{param.field.kind|cpp_result_type}} p_{{param.field.name}}{};
12 {%- endfor %} 12 {%- endfor %}
13 {{struct_macros.deserialize(struct, "params", "p_%s", serialization_context)}} 13 {{struct_macros.deserialize(struct, "params", "p_%s", serialization_context)}}
14 {%- endmacro %} 14 {%- endmacro %}
15 15
16 {%- macro pass_params(parameters) %} 16 {%- macro pass_params(parameters) %}
17 {%- for param in parameters %} 17 {%- for param in parameters %}
18 {%- if param.kind|is_move_only_kind -%} 18 {%- if param.kind|is_move_only_kind -%}
19 p_{{param.name}}.Pass() 19 std::move(p_{{param.name}})
20 {%- else -%} 20 {%- else -%}
21 p_{{param.name}} 21 p_{{param.name}}
22 {%- endif -%} 22 {%- endif -%}
23 {%- if not loop.last %}, {% endif %} 23 {%- if not loop.last %}, {% endif %}
24 {%- endfor %} 24 {%- endfor %}
25 {%- endmacro %} 25 {%- endmacro %}
26 26
27 {%- macro build_message(struct, struct_display_name) -%} 27 {%- macro build_message(struct, struct_display_name) -%}
28 {{struct_macros.serialize(struct, struct_display_name, "in_%s", "params", "bui lder.buffer()")}} 28 {{struct_macros.serialize(struct, struct_display_name, "in_%s", "params", "bui lder.buffer()")}}
29 params->EncodePointersAndHandles(builder.message()->mutable_handles()); 29 params->EncodePointersAndHandles(builder.message()->mutable_handles());
(...skipping 19 matching lines...) Expand all
49 49
50 {#--- ForwardToCallback definition #} 50 {#--- ForwardToCallback definition #}
51 {%- for method in interface.methods -%} 51 {%- for method in interface.methods -%}
52 {%- if method.response_parameters != None %} 52 {%- if method.response_parameters != None %}
53 class {{class_name}}_{{method.name}}_ForwardToCallback 53 class {{class_name}}_{{method.name}}_ForwardToCallback
54 : public mojo::MessageReceiver { 54 : public mojo::MessageReceiver {
55 public: 55 public:
56 {{class_name}}_{{method.name}}_ForwardToCallback( 56 {{class_name}}_{{method.name}}_ForwardToCallback(
57 const {{class_name}}::{{method.name}}Callback& callback, 57 const {{class_name}}::{{method.name}}Callback& callback,
58 scoped_refptr<mojo::internal::MultiplexRouter> router) 58 scoped_refptr<mojo::internal::MultiplexRouter> router)
59 : callback_(callback), serialization_context_(router.Pass()) { 59 : callback_(callback), serialization_context_(std::move(router)) {
60 } 60 }
61 bool Accept(mojo::Message* message) override; 61 bool Accept(mojo::Message* message) override;
62 private: 62 private:
63 {{class_name}}::{{method.name}}Callback callback_; 63 {{class_name}}::{{method.name}}Callback callback_;
64 mojo::internal::SerializationContext serialization_context_; 64 mojo::internal::SerializationContext serialization_context_;
65 MOJO_DISALLOW_COPY_AND_ASSIGN({{class_name}}_{{method.name}}_ForwardToCallback ); 65 MOJO_DISALLOW_COPY_AND_ASSIGN({{class_name}}_{{method.name}}_ForwardToCallback );
66 }; 66 };
67 bool {{class_name}}_{{method.name}}_ForwardToCallback::Accept( 67 bool {{class_name}}_{{method.name}}_ForwardToCallback::Accept(
68 mojo::Message* message) { 68 mojo::Message* message) {
69 internal::{{class_name}}_{{method.name}}_ResponseParams_Data* params = 69 internal::{{class_name}}_{{method.name}}_ResponseParams_Data* params =
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 default: 317 default:
318 break; 318 break;
319 } 319 }
320 320
321 // Unrecognized message. 321 // Unrecognized message.
322 ReportValidationError( 322 ReportValidationError(
323 mojo::internal::VALIDATION_ERROR_MESSAGE_HEADER_UNKNOWN_METHOD); 323 mojo::internal::VALIDATION_ERROR_MESSAGE_HEADER_UNKNOWN_METHOD);
324 return false; 324 return false;
325 } 325 }
326 {%- endif -%} 326 {%- endif -%}
OLDNEW
« no previous file with comments | « mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.cc ('k') | net/cert/ct_log_verifier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698