| Index: third_party/WebKit/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp b/third_party/WebKit/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp
|
| index cb5ca7442303270851f359f14bac81c3c5c7d8e3..bddc4458d6525262f1bb71889ba7ecbb674ba828 100644
|
| --- a/third_party/WebKit/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp
|
| +++ b/third_party/WebKit/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp
|
| @@ -40,20 +40,20 @@ namespace blink {
|
|
|
| bool V8SQLStatementErrorCallback::handleEvent(SQLTransaction* transaction,
|
| SQLError* error) {
|
| - v8::Isolate* isolate = m_scriptState->GetIsolate();
|
| + v8::Isolate* isolate = script_state_->GetIsolate();
|
| ExecutionContext* execution_context =
|
| - ExecutionContext::From(m_scriptState.Get());
|
| + ExecutionContext::From(script_state_.Get());
|
| if (!execution_context || execution_context->IsContextSuspended() ||
|
| execution_context->IsContextDestroyed())
|
| return true;
|
| - if (!m_scriptState->ContextIsValid())
|
| + if (!script_state_->ContextIsValid())
|
| return true;
|
| - ScriptState::Scope scope(m_scriptState.Get());
|
| + ScriptState::Scope scope(script_state_.Get());
|
|
|
| v8::Local<v8::Value> transaction_handle =
|
| - ToV8(transaction, m_scriptState->GetContext()->Global(), isolate);
|
| + ToV8(transaction, script_state_->GetContext()->Global(), isolate);
|
| v8::Local<v8::Value> error_handle =
|
| - ToV8(error, m_scriptState->GetContext()->Global(), isolate);
|
| + ToV8(error, script_state_->GetContext()->Global(), isolate);
|
| DCHECK(transaction_handle->IsObject());
|
|
|
| v8::Local<v8::Value> argv[] = {transaction_handle, error_handle};
|
| @@ -70,8 +70,8 @@ bool V8SQLStatementErrorCallback::handleEvent(SQLTransaction* transaction,
|
| // the error callback did not return false, or there was no error callback.
|
| // Jump to the last step in the overall steps.
|
| if (!V8ScriptRunner::CallFunction(m_callback.NewLocal(isolate),
|
| - ExecutionContext::From(m_scriptState.Get()),
|
| - m_scriptState->GetContext()->Global(),
|
| + ExecutionContext::From(script_state_.Get()),
|
| + script_state_->GetContext()->Global(),
|
| WTF_ARRAY_LENGTH(argv), argv, isolate)
|
| .ToLocal(&result))
|
| return true;
|
|
|