Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp |
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp |
index adcf84e2200bbbd26c40cf4d97bb7a0b6acd247d..64ee03bf52eade8d573a93674f3d20d59a2ed402 100644 |
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp |
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp |
@@ -24,7 +24,7 @@ |
namespace blink { |
V8TestCallbackInterface::V8TestCallbackInterface(v8::Local<v8::Function> callback, ScriptState* scriptState) |
- : m_scriptState(scriptState) { |
+ : script_state_(scriptState) { |
m_callback.Set(scriptState->GetIsolate(), callback); |
} |
@@ -36,20 +36,20 @@ DEFINE_TRACE(V8TestCallbackInterface) { |
void V8TestCallbackInterface::voidMethod() { |
ExecutionContext* executionContext = |
- ExecutionContext::From(m_scriptState.Get()); |
+ ExecutionContext::From(script_state_.Get()); |
DCHECK(!executionContext->IsContextSuspended()); |
if (!executionContext || executionContext->IsContextDestroyed()) |
return; |
- if (!m_scriptState->ContextIsValid()) |
+ if (!script_state_->ContextIsValid()) |
return; |
- ScriptState::Scope scope(m_scriptState.Get()); |
+ ScriptState::Scope scope(script_state_.Get()); |
v8::Local<v8::Value> *argv = 0; |
- v8::Isolate* isolate = m_scriptState->GetIsolate(); |
+ v8::Isolate* isolate = script_state_->GetIsolate(); |
V8ScriptRunner::CallFunction(m_callback.NewLocal(isolate), |
- ExecutionContext::From(m_scriptState.Get()), |
+ ExecutionContext::From(script_state_.Get()), |
v8::Undefined(isolate), |
0, |
argv, |
@@ -58,18 +58,18 @@ void V8TestCallbackInterface::voidMethod() { |
bool V8TestCallbackInterface::booleanMethod() { |
ExecutionContext* executionContext = |
- ExecutionContext::From(m_scriptState.Get()); |
+ ExecutionContext::From(script_state_.Get()); |
DCHECK(!executionContext->IsContextSuspended()); |
if (!executionContext || executionContext->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> *argv = 0; |
- v8::Isolate* isolate = m_scriptState->GetIsolate(); |
+ v8::Isolate* isolate = script_state_->GetIsolate(); |
v8::TryCatch exceptionCatcher(isolate); |
exceptionCatcher.SetVerbose(true); |
V8ScriptRunner::CallFunction(m_callback.NewLocal(isolate), |
@@ -83,21 +83,21 @@ bool V8TestCallbackInterface::booleanMethod() { |
void V8TestCallbackInterface::voidMethodBooleanArg(bool boolArg) { |
ExecutionContext* executionContext = |
- ExecutionContext::From(m_scriptState.Get()); |
+ ExecutionContext::From(script_state_.Get()); |
DCHECK(!executionContext->IsContextSuspended()); |
if (!executionContext || executionContext->IsContextDestroyed()) |
return; |
- if (!m_scriptState->ContextIsValid()) |
+ if (!script_state_->ContextIsValid()) |
return; |
- ScriptState::Scope scope(m_scriptState.Get()); |
+ ScriptState::Scope scope(script_state_.Get()); |
- v8::Local<v8::Value> boolArgHandle = v8::Boolean::New(m_scriptState->GetIsolate(), boolArg); |
+ v8::Local<v8::Value> boolArgHandle = v8::Boolean::New(script_state_->GetIsolate(), boolArg); |
v8::Local<v8::Value> argv[] = { boolArgHandle }; |
- v8::Isolate* isolate = m_scriptState->GetIsolate(); |
+ v8::Isolate* isolate = script_state_->GetIsolate(); |
V8ScriptRunner::CallFunction(m_callback.NewLocal(isolate), |
- ExecutionContext::From(m_scriptState.Get()), |
+ ExecutionContext::From(script_state_.Get()), |
v8::Undefined(isolate), |
1, |
argv, |
@@ -106,21 +106,21 @@ void V8TestCallbackInterface::voidMethodBooleanArg(bool boolArg) { |
void V8TestCallbackInterface::voidMethodSequenceArg(const HeapVector<Member<TestInterfaceEmpty>>& sequenceArg) { |
ExecutionContext* executionContext = |
- ExecutionContext::From(m_scriptState.Get()); |
+ ExecutionContext::From(script_state_.Get()); |
DCHECK(!executionContext->IsContextSuspended()); |
if (!executionContext || executionContext->IsContextDestroyed()) |
return; |
- if (!m_scriptState->ContextIsValid()) |
+ if (!script_state_->ContextIsValid()) |
return; |
- ScriptState::Scope scope(m_scriptState.Get()); |
+ ScriptState::Scope scope(script_state_.Get()); |
- v8::Local<v8::Value> sequenceArgHandle = ToV8(sequenceArg, m_scriptState->GetContext()->Global(), m_scriptState->GetIsolate()); |
+ v8::Local<v8::Value> sequenceArgHandle = ToV8(sequenceArg, script_state_->GetContext()->Global(), script_state_->GetIsolate()); |
v8::Local<v8::Value> argv[] = { sequenceArgHandle }; |
- v8::Isolate* isolate = m_scriptState->GetIsolate(); |
+ v8::Isolate* isolate = script_state_->GetIsolate(); |
V8ScriptRunner::CallFunction(m_callback.NewLocal(isolate), |
- ExecutionContext::From(m_scriptState.Get()), |
+ ExecutionContext::From(script_state_.Get()), |
v8::Undefined(isolate), |
1, |
argv, |
@@ -129,21 +129,21 @@ void V8TestCallbackInterface::voidMethodSequenceArg(const HeapVector<Member<Test |
void V8TestCallbackInterface::voidMethodFloatArg(float floatArg) { |
ExecutionContext* executionContext = |
- ExecutionContext::From(m_scriptState.Get()); |
+ ExecutionContext::From(script_state_.Get()); |
DCHECK(!executionContext->IsContextSuspended()); |
if (!executionContext || executionContext->IsContextDestroyed()) |
return; |
- if (!m_scriptState->ContextIsValid()) |
+ if (!script_state_->ContextIsValid()) |
return; |
- ScriptState::Scope scope(m_scriptState.Get()); |
+ ScriptState::Scope scope(script_state_.Get()); |
- v8::Local<v8::Value> floatArgHandle = v8::Number::New(m_scriptState->GetIsolate(), floatArg); |
+ v8::Local<v8::Value> floatArgHandle = v8::Number::New(script_state_->GetIsolate(), floatArg); |
v8::Local<v8::Value> argv[] = { floatArgHandle }; |
- v8::Isolate* isolate = m_scriptState->GetIsolate(); |
+ v8::Isolate* isolate = script_state_->GetIsolate(); |
V8ScriptRunner::CallFunction(m_callback.NewLocal(isolate), |
- ExecutionContext::From(m_scriptState.Get()), |
+ ExecutionContext::From(script_state_.Get()), |
v8::Undefined(isolate), |
1, |
argv, |
@@ -152,21 +152,21 @@ void V8TestCallbackInterface::voidMethodFloatArg(float floatArg) { |
void V8TestCallbackInterface::voidMethodTestInterfaceEmptyArg(TestInterfaceEmpty* testInterfaceEmptyArg) { |
ExecutionContext* executionContext = |
- ExecutionContext::From(m_scriptState.Get()); |
+ ExecutionContext::From(script_state_.Get()); |
DCHECK(!executionContext->IsContextSuspended()); |
if (!executionContext || executionContext->IsContextDestroyed()) |
return; |
- if (!m_scriptState->ContextIsValid()) |
+ if (!script_state_->ContextIsValid()) |
return; |
- ScriptState::Scope scope(m_scriptState.Get()); |
+ ScriptState::Scope scope(script_state_.Get()); |
- v8::Local<v8::Value> testInterfaceEmptyArgHandle = ToV8(testInterfaceEmptyArg, m_scriptState->GetContext()->Global(), m_scriptState->GetIsolate()); |
+ v8::Local<v8::Value> testInterfaceEmptyArgHandle = ToV8(testInterfaceEmptyArg, script_state_->GetContext()->Global(), script_state_->GetIsolate()); |
v8::Local<v8::Value> argv[] = { testInterfaceEmptyArgHandle }; |
- v8::Isolate* isolate = m_scriptState->GetIsolate(); |
+ v8::Isolate* isolate = script_state_->GetIsolate(); |
V8ScriptRunner::CallFunction(m_callback.NewLocal(isolate), |
- ExecutionContext::From(m_scriptState.Get()), |
+ ExecutionContext::From(script_state_.Get()), |
v8::Undefined(isolate), |
1, |
argv, |
@@ -175,22 +175,22 @@ void V8TestCallbackInterface::voidMethodTestInterfaceEmptyArg(TestInterfaceEmpty |
void V8TestCallbackInterface::voidMethodTestInterfaceEmptyStringArg(TestInterfaceEmpty* testInterfaceEmptyArg, const String& stringArg) { |
ExecutionContext* executionContext = |
- ExecutionContext::From(m_scriptState.Get()); |
+ ExecutionContext::From(script_state_.Get()); |
DCHECK(!executionContext->IsContextSuspended()); |
if (!executionContext || executionContext->IsContextDestroyed()) |
return; |
- if (!m_scriptState->ContextIsValid()) |
+ if (!script_state_->ContextIsValid()) |
return; |
- ScriptState::Scope scope(m_scriptState.Get()); |
+ ScriptState::Scope scope(script_state_.Get()); |
- v8::Local<v8::Value> testInterfaceEmptyArgHandle = ToV8(testInterfaceEmptyArg, m_scriptState->GetContext()->Global(), m_scriptState->GetIsolate()); |
- v8::Local<v8::Value> stringArgHandle = V8String(m_scriptState->GetIsolate(), stringArg); |
+ v8::Local<v8::Value> testInterfaceEmptyArgHandle = ToV8(testInterfaceEmptyArg, script_state_->GetContext()->Global(), script_state_->GetIsolate()); |
+ v8::Local<v8::Value> stringArgHandle = V8String(script_state_->GetIsolate(), stringArg); |
v8::Local<v8::Value> argv[] = { testInterfaceEmptyArgHandle, stringArgHandle }; |
- v8::Isolate* isolate = m_scriptState->GetIsolate(); |
+ v8::Isolate* isolate = script_state_->GetIsolate(); |
V8ScriptRunner::CallFunction(m_callback.NewLocal(isolate), |
- ExecutionContext::From(m_scriptState.Get()), |
+ ExecutionContext::From(script_state_.Get()), |
v8::Undefined(isolate), |
2, |
argv, |
@@ -199,22 +199,22 @@ void V8TestCallbackInterface::voidMethodTestInterfaceEmptyStringArg(TestInterfac |
void V8TestCallbackInterface::callbackWithThisValueVoidMethodStringArg(ScriptValue thisValue, const String& stringArg) { |
ExecutionContext* executionContext = |
- ExecutionContext::From(m_scriptState.Get()); |
+ ExecutionContext::From(script_state_.Get()); |
DCHECK(!executionContext->IsContextSuspended()); |
if (!executionContext || executionContext->IsContextDestroyed()) |
return; |
- if (!m_scriptState->ContextIsValid()) |
+ if (!script_state_->ContextIsValid()) |
return; |
- ScriptState::Scope scope(m_scriptState.Get()); |
+ ScriptState::Scope scope(script_state_.Get()); |
v8::Local<v8::Value> thisHandle = thisValue.V8Value(); |
- v8::Local<v8::Value> stringArgHandle = V8String(m_scriptState->GetIsolate(), stringArg); |
+ v8::Local<v8::Value> stringArgHandle = V8String(script_state_->GetIsolate(), stringArg); |
v8::Local<v8::Value> argv[] = { stringArgHandle }; |
- v8::Isolate* isolate = m_scriptState->GetIsolate(); |
+ v8::Isolate* isolate = script_state_->GetIsolate(); |
V8ScriptRunner::CallFunction(m_callback.NewLocal(isolate), |
- ExecutionContext::From(m_scriptState.Get()), |
+ ExecutionContext::From(script_state_.Get()), |
thisHandle, |
1, |
argv, |