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

Unified Diff: third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl

Issue 1127293003: Update mojo sdk to rev f84766d3b6420b7cf6a113d9d65d73cb5fe18d90 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: formatting Created 5 years, 7 months 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 side-by-side diff with in-line comments
Download patch
Index: third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
index 4355f41cfd386dd08d5e3078ad7d5f41d53d409a..cb4e78516fc5d815cfd2fe74f6e9bf1b1d6d44ad 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
@@ -43,7 +43,7 @@ bool {{union.name}}::Equals(const {{union.name}}& other) const {
switch (tag_) {
{% for field in union.fields %}
case Tag::{{field.name|upper}}:
-{% if field.kind|is_object_kind %}
+{% if field.kind|is_object_kind or field.kind|is_any_handle_kind %}
return mojo::internal::ValueTraits<{{field.kind|cpp_wrapper_type}}>::Equals(*(data_.{{field.name}}), *(other.data_.{{field.name}}));
{%- else %}
return mojo::internal::ValueTraits<{{field.kind|cpp_wrapper_type}}>::Equals(data_.{{field.name}}, other.data_.{{field.name}});
@@ -61,7 +61,7 @@ bool {{union.name}}::is_{{field.name}}() const {
{{field.kind|cpp_union_getter_return_type}} {{union.name}}::get_{{field.name}}() const {
MOJO_DCHECK(tag_ == Tag::{{field.name|upper}});
-{% if field.kind|is_object_kind %}
+{% if field.kind|is_object_kind or field.kind|is_any_handle_kind %}
return *(data_.{{field.name}});
{%- else %}
return data_.{{field.name}};
@@ -74,6 +74,8 @@ void {{union.name}}::set_{{field.name}}({{field.kind|cpp_const_wrapper_type}} {{
*(data_.{{field.name}}) = {{field.name}};
{% elif field.kind|is_object_kind %}
*(data_.{{field.name}}) = {{field.name}}.Pass();
+{% elif field.kind|is_any_handle_kind %}
+ data_.{{field.name}}->reset({{field.name}}.release());
{%- else %}
data_.{{field.name}} = {{field.name}};
{%- endif %}
@@ -93,7 +95,7 @@ void {{union.name}}::SetActive(Tag new_active) {
switch (new_active) {
{% for field in union.fields %}
case Tag::{{field.name|upper}}:
-{% if field.kind|is_object_kind %}
+{% if field.kind|is_object_kind or field.kind|is_any_handle_kind %}
data_.{{field.name}} = new {{field.kind|cpp_wrapper_type}}();
{%- endif %}
break;
@@ -107,7 +109,7 @@ void {{union.name}}::DestroyActive() {
switch (tag_) {
{% for field in union.fields %}
case Tag::{{field.name|upper}}:
-{% if field.kind|is_object_kind %}
+{% if field.kind|is_object_kind or field.kind|is_any_handle_kind %}
delete data_.{{field.name}};
{%- endif %}
break;

Powered by Google App Engine
This is Rietveld 408576698