Index: third_party/WebKit/Source/bindings/templates/callback_function.cpp.tmpl |
diff --git a/third_party/WebKit/Source/bindings/templates/callback_function.cpp.tmpl b/third_party/WebKit/Source/bindings/templates/callback_function.cpp.tmpl |
index 65856a3a06ccec8f02ac78e54ed35927f5621c28..c49d343595b5d17f3113210b9117820bbf3b5db0 100644 |
--- a/third_party/WebKit/Source/bindings/templates/callback_function.cpp.tmpl |
+++ b/third_party/WebKit/Source/bindings/templates/callback_function.cpp.tmpl |
@@ -19,7 +19,7 @@ namespace blink { |
} |
{{cpp_class}}::{{cpp_class}}(ScriptState* scriptState, v8::Local<v8::Function> callback) |
- : m_scriptState(scriptState), |
+ : script_state_(scriptState), |
m_callback(scriptState->GetIsolate(), this, callback) { |
DCHECK(!m_callback.IsEmpty()); |
} |
@@ -32,10 +32,10 @@ bool {{cpp_class}}::call({{argument_declarations | join(', ')}}) { |
if (m_callback.IsEmpty()) |
return false; |
- if (!m_scriptState->ContextIsValid()) |
+ if (!script_state_->ContextIsValid()) |
return false; |
- ExecutionContext* context = ExecutionContext::From(m_scriptState.Get()); |
+ ExecutionContext* context = ExecutionContext::From(script_state_.Get()); |
DCHECK(context); |
if (context->IsContextSuspended() || context->IsContextDestroyed()) |
return false; |
@@ -43,12 +43,12 @@ bool {{cpp_class}}::call({{argument_declarations | join(', ')}}) { |
// TODO(bashi): Make sure that using DummyExceptionStateForTesting is OK. |
// crbug.com/653769 |
DummyExceptionStateForTesting exceptionState; |
- ScriptState::Scope scope(m_scriptState.Get()); |
- v8::Isolate* isolate = m_scriptState->GetIsolate(); |
+ ScriptState::Scope scope(script_state_.Get()); |
+ v8::Isolate* isolate = script_state_->GetIsolate(); |
v8::Local<v8::Value> thisValue = ToV8( |
scriptWrappable, |
- m_scriptState->GetContext()->Global(), |
+ script_state_->GetContext()->Global(), |
isolate); |
{% for argument in arguments %} |