| Index: third_party/WebKit/Source/bindings/scripts/v8_callback_function.py
|
| diff --git a/third_party/WebKit/Source/bindings/scripts/v8_callback_function.py b/third_party/WebKit/Source/bindings/scripts/v8_callback_function.py
|
| index 4900abac48256e8271b05a03698b66df6eac8176..94675dc3c9f5aa7ff12ef9f6e36e083e511d4f06 100644
|
| --- a/third_party/WebKit/Source/bindings/scripts/v8_callback_function.py
|
| +++ b/third_party/WebKit/Source/bindings/scripts/v8_callback_function.py
|
| @@ -11,12 +11,14 @@ from v8_globals import includes # pylint: disable=W0403
|
| import v8_utilities # pylint: disable=W0403
|
|
|
| CALLBACK_FUNCTION_H_INCLUDES = frozenset([
|
| + 'bindings/core/v8/ExceptionState.h',
|
| 'bindings/core/v8/ScopedPersistent.h',
|
| 'platform/heap/Handle.h',
|
| 'wtf/text/WTFString.h',
|
| ])
|
| CALLBACK_FUNCTION_CPP_INCLUDES = frozenset([
|
| 'bindings/core/v8/ScriptState.h',
|
| + 'bindings/core/v8/ToV8.h',
|
| 'bindings/core/v8/V8Binding.h',
|
| 'wtf/Assertions.h',
|
| ])
|
| @@ -27,18 +29,25 @@ def callback_function_context(callback_function):
|
| includes.update(CALLBACK_FUNCTION_CPP_INCLUDES)
|
| idl_type = callback_function.idl_type
|
| idl_type_str = str(idl_type)
|
| +
|
| context = {
|
| 'cpp_class': callback_function.name,
|
| 'cpp_includes': sorted(CALLBACK_FUNCTION_CPP_INCLUDES),
|
| 'header_includes': sorted(CALLBACK_FUNCTION_H_INCLUDES),
|
| 'idl_type': idl_type_str,
|
| - 'return_cpp_type': (idl_type.cpp_type + '&') if idl_type.cpp_type != 'void' else None,
|
| - 'return_value': idl_type.v8_value_to_local_cpp_value(
|
| - callback_function.extended_attributes, 'v8ReturnValue', 'cppValue',
|
| - bailout_return_value="false") if idl_type.cpp_type != 'void' else None,
|
| 'v8_class': v8_utilities.v8_class_name(callback_function),
|
| }
|
| - context.update(arguments_context(callback_function.arguments, context['return_cpp_type']))
|
| +
|
| + if idl_type_str != 'void':
|
| + context.update({
|
| + 'return_cpp_type': idl_type.cpp_type + '&',
|
| + 'return_value': idl_type.v8_value_to_local_cpp_value(
|
| + callback_function.extended_attributes,
|
| + 'v8ReturnValue', 'cppValue',
|
| + isolate='scriptState->isolate()', bailout_return_value='false'),
|
| + })
|
| +
|
| + context.update(arguments_context(callback_function.arguments, context.get('return_cpp_type')))
|
| return context
|
|
|
|
|
| @@ -51,7 +60,11 @@ def arguments_context(arguments, return_cpp_type):
|
| creation_context='scriptState->context()->Global()'),
|
| }
|
|
|
| - argument_declarations = ['ScriptState* scriptState', 'ScriptWrappable* scriptWrappable']
|
| + argument_declarations = [
|
| + 'ScriptState* scriptState',
|
| + 'ScriptWrappable* scriptWrappable',
|
| + 'ExceptionState& exceptionState',
|
| + ]
|
| argument_declarations.extend(
|
| '%s %s' % (argument.idl_type.callback_cpp_type, argument.name)
|
| for argument in arguments)
|
|
|