| 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 e3086434b4f8ff97ef1aec9db449c285ec215bdd..dd7ea71675840f4861aaa444e008015e207a95e9 100644
|
| --- a/third_party/WebKit/Source/bindings/templates/callback_interface.cpp.tmpl
|
| +++ b/third_party/WebKit/Source/bindings/templates/callback_interface.cpp.tmpl
|
| @@ -10,7 +10,7 @@
|
| namespace blink {
|
|
|
| {{v8_class}}::{{v8_class}}(v8::Local<v8::Function> callback, ScriptState* scriptState)
|
| - : m_scriptState(scriptState) {
|
| + : script_state_(scriptState) {
|
| m_callback.Set(scriptState->GetIsolate(), callback);
|
| }
|
|
|
| @@ -25,14 +25,14 @@ DEFINE_TRACE({{v8_class}}) {
|
| {% set return_default = 'return true'
|
| if method.idl_type == 'boolean' else 'return' %}{# void #}
|
| ExecutionContext* executionContext =
|
| - ExecutionContext::From(m_scriptState.Get());
|
| + ExecutionContext::From(script_state_.Get());
|
| DCHECK(!executionContext->IsContextSuspended());
|
| if (!executionContext || executionContext->IsContextDestroyed())
|
| {{return_default}};
|
| - if (!m_scriptState->ContextIsValid())
|
| + if (!script_state_->ContextIsValid())
|
| {{return_default}};
|
|
|
| - ScriptState::Scope scope(m_scriptState.Get());
|
| + ScriptState::Scope scope(script_state_.Get());
|
| {% if method.call_with_this_handle %}
|
| v8::Local<v8::Value> thisHandle = thisValue.V8Value();
|
| {% endif %}
|
| @@ -47,7 +47,7 @@ DEFINE_TRACE({{v8_class}}) {
|
| v8::Local<v8::Value> *argv = 0;
|
| {% endif %}
|
|
|
| - v8::Isolate* isolate = m_scriptState->GetIsolate();
|
| + v8::Isolate* isolate = script_state_->GetIsolate();
|
| {% set this_handle_parameter = 'thisHandle'
|
| if method.call_with_this_handle else 'v8::Undefined(isolate)' %}
|
| {% if method.idl_type == 'boolean' %}
|
| @@ -62,7 +62,7 @@ DEFINE_TRACE({{v8_class}}) {
|
| return !exceptionCatcher.HasCaught();
|
| {% else %}{# void #}
|
| V8ScriptRunner::CallFunction(m_callback.NewLocal(isolate),
|
| - ExecutionContext::From(m_scriptState.Get()),
|
| + ExecutionContext::From(script_state_.Get()),
|
| {{this_handle_parameter}},
|
| {{method.arguments | length}},
|
| argv,
|
|
|