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

Side by Side Diff: third_party/WebKit/Source/bindings/scripts/v8_dictionary.py

Issue 2471393004: bindings: Use forward declarations for wrapper types in dictionary_impl (Closed)
Patch Set: WIP Created 4 years, 1 month 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 """Generate template contexts of dictionaries for both v8 bindings and 5 """Generate template contexts of dictionaries for both v8 bindings and
6 implementation classes that are used by blink's core/modules. 6 implementation classes that are used by blink's core/modules.
7 """ 7 """
8 8
9 import operator 9 import operator
10 from idl_types import IdlType 10 from idl_types import IdlType
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 members_dict = {} 154 members_dict = {}
155 for member in members: 155 for member in members:
156 cpp_name = member['cpp_name'] 156 cpp_name = member['cpp_name']
157 duplicated_member = members_dict.get(cpp_name) 157 duplicated_member = members_dict.get(cpp_name)
158 if duplicated_member and duplicated_member != member: 158 if duplicated_member and duplicated_member != member:
159 raise Exception('Member name conflict: %s' % cpp_name) 159 raise Exception('Member name conflict: %s' % cpp_name)
160 members_dict[cpp_name] = member 160 members_dict[cpp_name] = member
161 return sorted(members_dict.values(), key=lambda member: member['cpp_name ']) 161 return sorted(members_dict.values(), key=lambda member: member['cpp_name '])
162 162
163 includes.clear() 163 includes.clear()
164 header_forward_decls = set()
peria 2016/11/11 03:06:38 I think we rarely use forward declarations in .cpp
164 header_includes = set(['platform/heap/Handle.h']) 165 header_includes = set(['platform/heap/Handle.h'])
165 members = [member_impl_context(member, interfaces_info, header_includes) 166 members = [member_impl_context(member, interfaces_info,
167 header_includes, header_forward_decls)
166 for member in dictionary.members] 168 for member in dictionary.members]
167 members = remove_duplicate_members(members) 169 members = remove_duplicate_members(members)
168 context = { 170 context = {
171 'header_forward_decls': header_forward_decls,
peria 2016/11/11 03:06:38 ditto. for the key.
169 'header_includes': header_includes, 172 'header_includes': header_includes,
170 'cpp_class': v8_utilities.cpp_name(dictionary), 173 'cpp_class': v8_utilities.cpp_name(dictionary),
171 'members': members, 174 'members': members,
172 } 175 }
173 if dictionary.parent: 176 if dictionary.parent:
174 context['parent_cpp_class'] = v8_utilities.cpp_name_from_interfaces_info ( 177 context['parent_cpp_class'] = v8_utilities.cpp_name_from_interfaces_info (
175 dictionary.parent, interfaces_info) 178 dictionary.parent, interfaces_info)
176 parent_interface_info = interfaces_info.get(dictionary.parent) 179 parent_interface_info = interfaces_info.get(dictionary.parent)
177 if parent_interface_info: 180 if parent_interface_info:
178 context['header_includes'].add( 181 context['header_includes'].add(
179 parent_interface_info['include_path']) 182 parent_interface_info['include_path'])
180 else: 183 else:
181 context['parent_cpp_class'] = 'IDLDictionaryBase' 184 context['parent_cpp_class'] = 'IDLDictionaryBase'
182 context['header_includes'].add( 185 context['header_includes'].add(
183 'bindings/core/v8/IDLDictionaryBase.h') 186 'bindings/core/v8/IDLDictionaryBase.h')
184 return context 187 return context
185 188
186 189
187 def member_impl_context(member, interfaces_info, header_includes): 190 def member_impl_context(member, interfaces_info, header_includes,
191 header_forward_decls):
188 idl_type = unwrap_nullable_if_needed(member.idl_type) 192 idl_type = unwrap_nullable_if_needed(member.idl_type)
189 cpp_name = v8_utilities.cpp_name(member) 193 cpp_name = v8_utilities.cpp_name(member)
190 194
191 def getter_expression(): 195 def getter_expression():
192 if idl_type.impl_should_use_nullable_container: 196 if idl_type.impl_should_use_nullable_container:
193 return 'm_%s.get()' % cpp_name 197 return 'm_%s.get()' % cpp_name
194 return 'm_%s' % cpp_name 198 return 'm_%s' % cpp_name
195 199
196 def has_method_expression(): 200 def has_method_expression():
197 if idl_type.impl_should_use_nullable_container or idl_type.is_enum or id l_type.is_string_type or idl_type.is_union_type: 201 if idl_type.impl_should_use_nullable_container or idl_type.is_enum or id l_type.is_string_type or idl_type.is_union_type:
198 return '!m_%s.isNull()' % cpp_name 202 return '!m_%s.isNull()' % cpp_name
199 elif idl_type.name in ['Any', 'Object']: 203 elif idl_type.name in ['Any', 'Object']:
200 return '!(m_{0}.isEmpty() || m_{0}.isNull() || m_{0}.isUndefined())' .format(cpp_name) 204 return '!(m_{0}.isEmpty() || m_{0}.isNull() || m_{0}.isUndefined())' .format(cpp_name)
201 elif idl_type.name == 'Dictionary': 205 elif idl_type.name == 'Dictionary':
202 return '!m_%s.isUndefinedOrNull()' % cpp_name 206 return '!m_%s.isUndefinedOrNull()' % cpp_name
203 else: 207 else:
204 return 'm_%s' % cpp_name 208 return 'm_%s' % cpp_name
205 209
206 def member_cpp_type(): 210 def member_cpp_type():
207 member_cpp_type = idl_type.cpp_type_args(used_in_cpp_sequence=True) 211 member_cpp_type = idl_type.cpp_type_args(used_in_cpp_sequence=True)
208 if idl_type.impl_should_use_nullable_container: 212 if idl_type.impl_should_use_nullable_container:
209 return v8_types.cpp_template_type('Nullable', member_cpp_type) 213 return v8_types.cpp_template_type('Nullable', member_cpp_type)
210 return member_cpp_type 214 return member_cpp_type
211 215
212 cpp_default_value = None 216 cpp_default_value = None
213 if member.default_value and not member.default_value.is_null: 217 if member.default_value and not member.default_value.is_null:
214 cpp_default_value = idl_type.literal_cpp_value(member.default_value) 218 cpp_default_value = idl_type.literal_cpp_value(member.default_value)
215 219
216 header_includes.update(idl_type.impl_includes_for_type(interfaces_info)) 220 forward_decl_name = idl_type.impl_forward_declaration_name
221 if forward_decl_name:
222 includes.update(idl_type.impl_includes_for_type(interfaces_info))
223 header_forward_decls.add(forward_decl_name)
224 else:
225 header_includes.update(idl_type.impl_includes_for_type(interfaces_info))
226
217 return { 227 return {
218 'cpp_default_value': cpp_default_value, 228 'cpp_default_value': cpp_default_value,
219 'cpp_name': cpp_name, 229 'cpp_name': cpp_name,
220 'getter_expression': getter_expression(), 230 'getter_expression': getter_expression(),
221 'has_method_expression': has_method_expression(), 231 'has_method_expression': has_method_expression(),
222 'has_method_name': has_method_name_for_dictionary_member(member), 232 'has_method_name': has_method_name_for_dictionary_member(member),
223 'is_nullable': idl_type.is_nullable, 233 'is_nullable': idl_type.is_nullable,
224 'is_traceable': idl_type.is_traceable, 234 'is_traceable': idl_type.is_traceable,
225 'member_cpp_type': member_cpp_type(), 235 'member_cpp_type': member_cpp_type(),
226 'null_setter_name': null_setter_name_for_dictionary_member(member), 236 'null_setter_name': null_setter_name_for_dictionary_member(member),
227 'rvalue_cpp_type': idl_type.cpp_type_args(used_as_rvalue_type=True), 237 'rvalue_cpp_type': idl_type.cpp_type_args(used_as_rvalue_type=True),
228 'setter_name': setter_name_for_dictionary_member(member), 238 'setter_name': setter_name_for_dictionary_member(member),
229 } 239 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698