| Index: third_party/WebKit/Source/bindings/tests/results/core/StringSequenceCallbackFunctionLongSequenceArg.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/StringSequenceCallbackFunctionLongSequenceArg.cpp b/third_party/WebKit/Source/bindings/tests/results/core/StringSequenceCallbackFunctionLongSequenceArg.cpp
|
| index c38859dc0351bb0d7213275ccae77ee6a46e4de7..a0bee1de46f803349d48a33005bf075378761cc7 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/StringSequenceCallbackFunctionLongSequenceArg.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/StringSequenceCallbackFunctionLongSequenceArg.cpp
|
| @@ -31,7 +31,7 @@ StringSequenceCallbackFunctionLongSequenceArg* StringSequenceCallbackFunctionLon
|
| }
|
|
|
| StringSequenceCallbackFunctionLongSequenceArg::StringSequenceCallbackFunctionLongSequenceArg(ScriptState* scriptState, v8::Local<v8::Function> callback)
|
| - : m_scriptState(scriptState),
|
| + : script_state_(scriptState),
|
| m_callback(scriptState->GetIsolate(), this, callback) {
|
| DCHECK(!m_callback.IsEmpty());
|
| }
|
| @@ -44,10 +44,10 @@ bool StringSequenceCallbackFunctionLongSequenceArg::call(ScriptWrappable* script
|
| 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;
|
| @@ -55,15 +55,15 @@ bool StringSequenceCallbackFunctionLongSequenceArg::call(ScriptWrappable* script
|
| // 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);
|
|
|
| - v8::Local<v8::Value> argArgument = ToV8(arg, m_scriptState->GetContext()->Global(), m_scriptState->GetIsolate());
|
| + v8::Local<v8::Value> argArgument = ToV8(arg, script_state_->GetContext()->Global(), script_state_->GetIsolate());
|
| v8::Local<v8::Value> argv[] = { argArgument };
|
| v8::TryCatch exceptionCatcher(isolate);
|
| exceptionCatcher.SetVerbose(true);
|
| @@ -78,7 +78,7 @@ bool StringSequenceCallbackFunctionLongSequenceArg::call(ScriptWrappable* script
|
| return false;
|
| }
|
|
|
| - Vector<String> cppValue = NativeValueTraits<IDLSequence<IDLString>>::NativeValue(m_scriptState->GetIsolate(), v8ReturnValue, exceptionState);
|
| + Vector<String> cppValue = NativeValueTraits<IDLSequence<IDLString>>::NativeValue(script_state_->GetIsolate(), v8ReturnValue, exceptionState);
|
| if (exceptionState.HadException())
|
| return false;
|
| returnValue = cppValue;
|
|
|