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

Side by Side Diff: Source/bindings/templates/union.cpp

Issue 946973005: IDL: Drop value conversion (V8 -> C++) macros from generated code (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: minor cleanup Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file has been auto-generated by {{code_generator}}. DO NOT MODIFY! 5 // This file has been auto-generated by {{code_generator}}. DO NOT MODIFY!
6 6
7 #include "config.h" 7 #include "config.h"
8 #include "{{header_filename}}" 8 #include "{{header_filename}}"
9 9
10 {% from 'conversions.cpp' import v8_value_to_local_cpp_value %}
10 {% macro assign_and_return_if_hasinstance(member) %} 11 {% macro assign_and_return_if_hasinstance(member) %}
11 if (V8{{member.type_name}}::hasInstance(v8Value, isolate)) { 12 if (V8{{member.type_name}}::hasInstance(v8Value, isolate)) {
12 {{member.cpp_local_type}} cppValue = V8{{member.type_name}}::toImpl(v8::Loca l<v8::Object>::Cast(v8Value)); 13 {{member.cpp_local_type}} cppValue = V8{{member.type_name}}::toImpl(v8::Loca l<v8::Object>::Cast(v8Value));
13 impl.set{{member.type_name}}(cppValue); 14 impl.set{{member.type_name}}(cppValue);
14 return; 15 return true;
15 } 16 }
16 {% endmacro %} 17 {% endmacro %}
17 {% for filename in cpp_includes %} 18 {% for filename in cpp_includes %}
18 #include "{{filename}}" 19 #include "{{filename}}"
19 {% endfor %} 20 {% endfor %}
20 21
21 namespace blink { 22 namespace blink {
22 23
23 {% for container in containers %} 24 {% for container in containers %}
24 {{container.cpp_class}}::{{container.cpp_class}}() 25 {{container.cpp_class}}::{{container.cpp_class}}()
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 {% endfor %} 58 {% endfor %}
58 {% if container.needs_trace %} 59 {% if container.needs_trace %}
59 void {{container.cpp_class}}::trace(Visitor* visitor) 60 void {{container.cpp_class}}::trace(Visitor* visitor)
60 { 61 {
61 {% for member in container.members if member.is_traceable %} 62 {% for member in container.members if member.is_traceable %}
62 visitor->trace(m_{{member.cpp_name}}); 63 visitor->trace(m_{{member.cpp_name}});
63 {% endfor %} 64 {% endfor %}
64 } 65 }
65 66
66 {% endif %} 67 {% endif %}
67 void V8{{container.cpp_class}}::toImpl(v8::Isolate* isolate, v8::Local<v8::Value > v8Value, {{container.cpp_class}}& impl, ExceptionState& exceptionState) 68 bool V8{{container.cpp_class}}::toImpl(v8::Isolate* isolate, v8::Local<v8::Value > v8Value, {{container.cpp_class}}& impl, ExceptionState& exceptionState)
68 { 69 {
69 if (v8Value.IsEmpty()) 70 if (v8Value.IsEmpty())
70 return; 71 return true;
71 72
72 {# The numbers in the following comments refer to the steps described in 73 {# The numbers in the following comments refer to the steps described in
73 http://heycam.github.io/webidl/#es-union 74 http://heycam.github.io/webidl/#es-union
74 NOTE: Step 1 (null or undefined) is handled in *OrNull::toImpl() 75 NOTE: Step 1 (null or undefined) is handled in *OrNull::toImpl()
75 FIXME: Implement all necessary steps #} 76 FIXME: Implement all necessary steps #}
76 {# 3. Platform objects (interfaces) #} 77 {# 3. Platform objects (interfaces) #}
77 {% for interface in container.interface_types %} 78 {% for interface in container.interface_types %}
78 {{assign_and_return_if_hasinstance(interface) | indent}} 79 {{assign_and_return_if_hasinstance(interface) | indent}}
79 80
80 {% endfor %} 81 {% endfor %}
81 {# 8. ArrayBuffer #} 82 {# 8. ArrayBuffer #}
82 {% if container.array_buffer_type %} 83 {% if container.array_buffer_type %}
83 {{assign_and_return_if_hasinstance(container.array_buffer_type) | indent}} 84 {{assign_and_return_if_hasinstance(container.array_buffer_type) | indent}}
84 85
85 {% endif %} 86 {% endif %}
86 {# 9., 10. ArrayBufferView #} 87 {# 9., 10. ArrayBufferView #}
87 {# FIXME: Individual typed arrays (e.g. Uint8Array) aren't supported yet. #} 88 {# FIXME: Individual typed arrays (e.g. Uint8Array) aren't supported yet. #}
88 {% if container.array_buffer_view_type %} 89 {% if container.array_buffer_view_type %}
89 {{assign_and_return_if_hasinstance(container.array_buffer_view_type) | inden t}} 90 {{assign_and_return_if_hasinstance(container.array_buffer_view_type) | inden t}}
90 91
91 {% endif %} 92 {% endif %}
92 {% if container.dictionary_type %} 93 {% if container.dictionary_type %}
93 {# 12. Dictionaries #} 94 {# 12. Dictionaries #}
94 {# FIXME: This should also check "object but not Date or RegExp". Add checks 95 {# FIXME: This should also check "object but not Date or RegExp". Add checks
95 when we implement conversions for Date and RegExp. #} 96 when we implement conversions for Date and RegExp. #}
96 if (isUndefinedOrNull(v8Value) || v8Value->IsObject()) { 97 if (isUndefinedOrNull(v8Value) || v8Value->IsObject()) {
97 {% if container.dictionary_type.type_name != 'Dictionary' %} 98 {% if container.dictionary_type.type_name != 'Dictionary' %}
98 {{container.dictionary_type.cpp_local_type}} cppValue; 99 {{container.dictionary_type.cpp_local_type}} cppValue;
99 {% endif %} 100 {% endif %}
100 {{container.dictionary_type.v8_value_to_local_cpp_value}}; 101 {{v8_value_to_local_cpp_value(container.dictionary_type) | indent(8)}}
101 impl.set{{container.dictionary_type.type_name}}(cppValue); 102 impl.set{{container.dictionary_type.type_name}}(cppValue);
102 return; 103 return true;
103 } 104 }
104 105
105 {% endif %} 106 {% endif %}
106 {% if container.array_or_sequence_type %} 107 {% if container.array_or_sequence_type %}
107 {# 13. Arrays/Sequences #} 108 {# 13. Arrays/Sequences #}
108 {# FIXME: This should also check "object but not Date or RegExp". Add checks 109 {# FIXME: This should also check "object but not Date or RegExp". Add checks
109 when we implement conversions for Date and RegExp. #} 110 when we implement conversions for Date and RegExp. #}
110 {# FIXME: Should check for sequences too, not just Array instances. #} 111 {# FIXME: Should check for sequences too, not just Array instances. #}
111 if (v8Value->IsArray()) { 112 if (v8Value->IsArray()) {
112 {{container.array_or_sequence_type.v8_value_to_local_cpp_value}}; 113 {{v8_value_to_local_cpp_value(container.array_or_sequence_type) | indent (8)}}
113 impl.set{{container.array_or_sequence_type.type_name}}(cppValue); 114 impl.set{{container.array_or_sequence_type.type_name}}(cppValue);
114 return; 115 return true;
115 } 116 }
116 117
117 {% endif %} 118 {% endif %}
118 {# FIXME: In some cases, we can omit boolean and numeric type checks because 119 {# FIXME: In some cases, we can omit boolean and numeric type checks because
119 we have fallback conversions. (step 17 and 18) #} 120 we have fallback conversions. (step 17 and 18) #}
120 {% if container.boolean_type %} 121 {% if container.boolean_type %}
121 {# 14. Boolean #} 122 {# 14. Boolean #}
122 if (v8Value->IsBoolean()) { 123 if (v8Value->IsBoolean()) {
123 impl.setBoolean(v8Value->ToBoolean()->Value()); 124 impl.setBoolean(v8Value->ToBoolean()->Value());
124 return; 125 return true;
125 } 126 }
126 127
127 {% endif %} 128 {% endif %}
128 {% if container.numeric_type %} 129 {% if container.numeric_type %}
129 {# 15. Number #} 130 {# 15. Number #}
130 if (v8Value->IsNumber()) { 131 if (v8Value->IsNumber()) {
131 {{container.numeric_type.v8_value_to_local_cpp_value}}; 132 {{v8_value_to_local_cpp_value(container.numeric_type) | indent(8)}}
132 impl.set{{container.numeric_type.type_name}}(cppValue); 133 impl.set{{container.numeric_type.type_name}}(cppValue);
133 return; 134 return true;
134 } 135 }
135 136
136 {% endif %} 137 {% endif %}
137 {% if container.string_type %} 138 {% if container.string_type %}
138 {# 16. String #} 139 {# 16. String #}
139 { 140 {
140 {{container.string_type.v8_value_to_local_cpp_value}}; 141 {{v8_value_to_local_cpp_value(container.string_type) | indent(8)}}
141 {% if container.string_type.enum_validation_expression %} 142 {% if container.string_type.enum_validation_expression %}
142 String string = cppValue; 143 String string = cppValue;
143 if (!({{container.string_type.enum_validation_expression}})) { 144 if (!({{container.string_type.enum_validation_expression}})) {
144 exceptionState.throwTypeError("'" + string + "' is not a valid enum value."); 145 exceptionState.throwTypeError("'" + string + "' is not a valid enum value.");
145 return; 146 return false;
146 } 147 }
147 {% endif %} 148 {% endif %}
148 impl.set{{container.string_type.type_name}}(cppValue); 149 impl.set{{container.string_type.type_name}}(cppValue);
149 return; 150 return true;
150 } 151 }
151 152
152 {# 17. Number (fallback) #} 153 {# 17. Number (fallback) #}
153 {% elif container.numeric_type %} 154 {% elif container.numeric_type %}
154 { 155 {
155 {{container.numeric_type.v8_value_to_local_cpp_value}}; 156 {{v8_value_to_local_cpp_value(container.numeric_type) | indent(8)}}
156 impl.set{{container.numeric_type.type_name}}(cppValue); 157 impl.set{{container.numeric_type.type_name}}(cppValue);
157 return; 158 return true;
158 } 159 }
159 160
160 {# 18. Boolean (fallback) #} 161 {# 18. Boolean (fallback) #}
161 {% elif container.boolean_type %} 162 {% elif container.boolean_type %}
162 { 163 {
163 impl.setBoolean(v8Value->ToBoolean()->Value()); 164 impl.setBoolean(v8Value->BooleanValue());
164 return; 165 return true;
165 } 166 }
166 167
167 {% else %} 168 {% else %}
168 {# 19. TypeError #} 169 {# 19. TypeError #}
169 exceptionState.throwTypeError("The provided value is not of type '{{containe r.type_string}}'"); 170 exceptionState.throwTypeError("The provided value is not of type '{{containe r.type_string}}'");
171 return false;
170 {% endif %} 172 {% endif %}
171 } 173 }
172 174
173 v8::Local<v8::Value> toV8(const {{container.cpp_class}}& impl, v8::Local<v8::Obj ect> creationContext, v8::Isolate* isolate) 175 v8::Local<v8::Value> toV8(const {{container.cpp_class}}& impl, v8::Local<v8::Obj ect> creationContext, v8::Isolate* isolate)
174 { 176 {
175 switch (impl.m_type) { 177 switch (impl.m_type) {
176 case {{container.cpp_class}}::SpecificTypeNone: 178 case {{container.cpp_class}}::SpecificTypeNone:
177 {# FIXME: We might want to return undefined in some cases #} 179 {# FIXME: We might want to return undefined in some cases #}
178 return v8::Null(isolate); 180 return v8::Null(isolate);
179 {% for member in container.members %} 181 {% for member in container.members %}
180 case {{container.cpp_class}}::{{member.specific_type_enum}}: 182 case {{container.cpp_class}}::{{member.specific_type_enum}}:
181 return {{member.cpp_value_to_v8_value}}; 183 return {{member.cpp_value_to_v8_value}};
182 {% endfor %} 184 {% endfor %}
183 default: 185 default:
184 ASSERT_NOT_REACHED(); 186 ASSERT_NOT_REACHED();
185 } 187 }
186 return v8::Local<v8::Value>(); 188 return v8::Local<v8::Value>();
187 } 189 }
188 190
189 {{container.cpp_class}} NativeValueTraits<{{container.cpp_class}}>::nativeValue( const v8::Local<v8::Value>& value, v8::Isolate* isolate, ExceptionState& excepti onState) 191 {{container.cpp_class}} NativeValueTraits<{{container.cpp_class}}>::nativeValue( const v8::Local<v8::Value>& value, v8::Isolate* isolate, ExceptionState& excepti onState)
190 { 192 {
191 {{container.cpp_class}} impl; 193 {{container.cpp_class}} impl;
192 V8{{container.cpp_class}}::toImpl(isolate, value, impl, exceptionState); 194 V8{{container.cpp_class}}::toImpl(isolate, value, impl, exceptionState);
193 return impl; 195 return impl;
194 } 196 }
195 197
196 {% endfor %} 198 {% endfor %}
197 } // namespace blink 199 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698