OLD | NEW |
1 # Copyright (C) 2013 Google Inc. All rights reserved. | 1 # Copyright (C) 2013 Google Inc. All rights reserved. |
2 # | 2 # |
3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
5 # met: | 5 # met: |
6 # | 6 # |
7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 def cpp_type(idl_type): | 56 def cpp_type(idl_type): |
57 # FIXME: remove this function by making callback types consistent | 57 # FIXME: remove this function by making callback types consistent |
58 # (always use usual v8_types.cpp_type) | 58 # (always use usual v8_types.cpp_type) |
59 idl_type_name = idl_type.name | 59 idl_type_name = idl_type.name |
60 if idl_type_name == 'String': | 60 if idl_type_name == 'String': |
61 return 'const String&' | 61 return 'const String&' |
62 if idl_type_name == 'void': | 62 if idl_type_name == 'void': |
63 return 'void' | 63 return 'void' |
64 # Callbacks use raw pointers, so raw_type=True | 64 # Callbacks use raw pointers, so raw_type=True |
65 raw_cpp_type = idl_type.cpp_type_args(raw_type=True) | 65 raw_cpp_type = idl_type.cpp_type_args(raw_type=True) |
66 if raw_cpp_type.startswith(('Vector', 'HeapVector', 'WillBeHeapVector')): | 66 # Pass containers and dictionaries to callback method by const reference rat
her than by value |
| 67 if raw_cpp_type.startswith(('Vector', 'HeapVector', 'WillBeHeapVector')) or
idl_type.is_dictionary: |
67 return 'const %s&' % raw_cpp_type | 68 return 'const %s&' % raw_cpp_type |
68 return raw_cpp_type | 69 return raw_cpp_type |
69 | 70 |
70 IdlTypeBase.callback_cpp_type = property(cpp_type) | 71 IdlTypeBase.callback_cpp_type = property(cpp_type) |
71 | 72 |
72 | 73 |
73 def callback_interface_context(callback_interface): | 74 def callback_interface_context(callback_interface): |
74 includes.clear() | 75 includes.clear() |
75 includes.update(CALLBACK_INTERFACE_CPP_INCLUDES) | 76 includes.update(CALLBACK_INTERFACE_CPP_INCLUDES) |
76 return { | 77 return { |
77 'conditional_string': v8_utilities.conditional_string(callback_interface
), | |
78 'cpp_class': callback_interface.name, | 78 'cpp_class': callback_interface.name, |
79 'v8_class': v8_utilities.v8_class_name(callback_interface), | 79 'v8_class': v8_utilities.v8_class_name(callback_interface), |
80 'header_includes': set(CALLBACK_INTERFACE_H_INCLUDES), | 80 'header_includes': set(CALLBACK_INTERFACE_H_INCLUDES), |
81 'methods': [method_context(operation) | 81 'methods': [method_context(operation) |
82 for operation in callback_interface.operations], | 82 for operation in callback_interface.operations], |
83 } | 83 } |
84 | 84 |
85 | 85 |
86 def add_includes_for_operation(operation): | 86 def add_includes_for_operation(operation): |
87 operation.idl_type.add_includes_for_type() | 87 operation.idl_type.add_includes_for_type() |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 } | 122 } |
123 | 123 |
124 argument_declarations = ['ScriptValue thisValue'] if call_with_this_handle e
lse [] | 124 argument_declarations = ['ScriptValue thisValue'] if call_with_this_handle e
lse [] |
125 argument_declarations.extend( | 125 argument_declarations.extend( |
126 '%s %s' % (argument.idl_type.callback_cpp_type, argument.name) | 126 '%s %s' % (argument.idl_type.callback_cpp_type, argument.name) |
127 for argument in arguments) | 127 for argument in arguments) |
128 return { | 128 return { |
129 'argument_declarations': argument_declarations, | 129 'argument_declarations': argument_declarations, |
130 'arguments': [argument_context(argument) for argument in arguments], | 130 'arguments': [argument_context(argument) for argument in arguments], |
131 } | 131 } |
OLD | NEW |