| Index: third_party/WebKit/Source/bindings/templates/callback_interface.cpp.tmpl
|
| diff --git a/third_party/WebKit/Source/bindings/templates/callback_interface.cpp.tmpl b/third_party/WebKit/Source/bindings/templates/callback_interface.cpp.tmpl
|
| index a101ddaba03b4e9cbdb6929da443c09cbb0386da..c4d76b770aefccd7858ab744ec57e20325b4c05d 100644
|
| --- a/third_party/WebKit/Source/bindings/templates/callback_interface.cpp.tmpl
|
| +++ b/third_party/WebKit/Source/bindings/templates/callback_interface.cpp.tmpl
|
| @@ -11,28 +11,28 @@ namespace blink {
|
|
|
| {{v8_class}}::{{v8_class}}(v8::Local<v8::Function> callback, ScriptState* scriptState)
|
| : m_scriptState(scriptState) {
|
| - m_callback.set(scriptState->isolate(), callback);
|
| + m_callback.Set(scriptState->GetIsolate(), callback);
|
| }
|
|
|
| {{v8_class}}::~{{v8_class}}() {}
|
|
|
| DEFINE_TRACE({{v8_class}}) {
|
| - {{cpp_class}}::trace(visitor);
|
| + {{cpp_class}}::Trace(visitor);
|
| }
|
|
|
| {% for method in methods if not method.is_custom %}
|
| {{method.cpp_type}} {{v8_class}}::{{method.name}}({{method.argument_declarations | join(', ')}}) {
|
| {% set return_default = 'return true'
|
| if method.idl_type == 'boolean' else 'return' %}{# void #}
|
| - ExecutionContext* executionContext = m_scriptState->getExecutionContext();
|
| - if (!executionContext || executionContext->isContextSuspended() ||
|
| - executionContext->isContextDestroyed())
|
| + ExecutionContext* executionContext = m_scriptState->GetExecutionContext();
|
| + if (!executionContext || executionContext->IsContextSuspended() ||
|
| + executionContext->IsContextDestroyed())
|
| {{return_default}};
|
| - if (!m_scriptState->contextIsValid())
|
| + if (!m_scriptState->ContextIsValid())
|
| {{return_default}};
|
| - ScriptState::Scope scope(m_scriptState.get());
|
| + ScriptState::Scope scope(m_scriptState.Get());
|
| {% if method.call_with_this_handle %}
|
| - v8::Local<v8::Value> thisHandle = thisValue.v8Value();
|
| + v8::Local<v8::Value> thisHandle = thisValue.V8Value();
|
| {% endif %}
|
| {% for argument in method.arguments %}
|
| v8::Local<v8::Value> {{argument.handle}} = {{argument.cpp_value_to_v8_value}};
|
| @@ -44,14 +44,14 @@ DEFINE_TRACE({{v8_class}}) {
|
| v8::Local<v8::Value> *argv = 0;
|
| {% endif %}
|
|
|
| - {% set this_handle_parameter = 'thisHandle, ' if method.call_with_this_handle else 'v8::Undefined(m_scriptState->isolate()), ' %}
|
| + {% set this_handle_parameter = 'thisHandle, ' if method.call_with_this_handle else 'v8::Undefined(m_scriptState->GetIsolate()), ' %}
|
| {% if method.idl_type == 'boolean' %}
|
| - v8::TryCatch exceptionCatcher(m_scriptState->isolate());
|
| + v8::TryCatch exceptionCatcher(m_scriptState->GetIsolate());
|
| exceptionCatcher.SetVerbose(true);
|
| - V8ScriptRunner::callFunction(m_callback.newLocal(m_scriptState->isolate()), m_scriptState->getExecutionContext(), {{this_handle_parameter}}{{method.arguments | length}}, argv, m_scriptState->isolate());
|
| + V8ScriptRunner::CallFunction(m_callback.NewLocal(m_scriptState->GetIsolate()), m_scriptState->GetExecutionContext(), {{this_handle_parameter}}{{method.arguments | length}}, argv, m_scriptState->GetIsolate());
|
| return !exceptionCatcher.HasCaught();
|
| {% else %}{# void #}
|
| - V8ScriptRunner::callFunction(m_callback.newLocal(m_scriptState->isolate()), m_scriptState->getExecutionContext(), {{this_handle_parameter}}{{method.arguments | length}}, argv, m_scriptState->isolate());
|
| + V8ScriptRunner::CallFunction(m_callback.NewLocal(m_scriptState->GetIsolate()), m_scriptState->GetExecutionContext(), {{this_handle_parameter}}{{method.arguments | length}}, argv, m_scriptState->GetIsolate());
|
| {% endif %}
|
| }
|
|
|
|
|