| Index: Source/bindings/templates/methods.cpp
|
| diff --git a/Source/bindings/templates/methods.cpp b/Source/bindings/templates/methods.cpp
|
| index 580d07f5226f03b1969b390961c8f3004a268f41..3ad741bccf32a618fa1c59a68a7595aa3aea4e73 100644
|
| --- a/Source/bindings/templates/methods.cpp
|
| +++ b/Source/bindings/templates/methods.cpp
|
| @@ -521,19 +521,19 @@ static bool {{method.name}}MethodImplementedInPrivateScript({{method.argument_de
|
| {% endif %}
|
| // FIXME: Support exceptions thrown from Blink-in-JS.
|
| v8::TryCatch block;
|
| - {% if method.returned_v8_value_to_local_cpp_value %}
|
| + {% if method.idl_type == 'void' %}
|
| + PrivateScriptRunner::runDOMMethod(scriptState, "{{cpp_class}}", "{{method.name}}", holder, {{method.arguments | length}}, argv);
|
| + if (block.HasCaught())
|
| + return false;
|
| + {% else %}
|
| v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, "{{cpp_class}}", "{{method.name}}", holder, {{method.arguments | length}}, argv);
|
| if (block.HasCaught())
|
| return false;
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "{{method.name}}", "{{cpp_class}}", scriptState->context()->Global(), scriptState->isolate());
|
| - {{method.raw_cpp_type}} cppValue = {{method.returned_v8_value_to_local_cpp_value}};
|
| + {{method.private_script_v8_value_to_local_cpp_value}};
|
| if (block.HasCaught())
|
| return false;
|
| *result = cppValue;
|
| - {% else %}{# void return type #}
|
| - PrivateScriptRunner::runDOMMethod(scriptState, "{{cpp_class}}", "{{method.name}}", holder, {{method.arguments | length}}, argv);
|
| - if (block.HasCaught())
|
| - return false;
|
| {% endif %}
|
| return true;
|
| }
|
|
|