| 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 69ea2fa20f7a8e5fd8e620730fda013e74084847..7435cec9f85dfd9c5f1405a331959df30cfc716d 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestCallbackInterface.cpp
|
| @@ -37,8 +37,8 @@
|
| void V8TestCallbackInterface::voidMethod() {
|
| ExecutionContext* executionContext =
|
| ExecutionContext::From(m_scriptState.Get());
|
| - DCHECK(!executionContext->IsContextSuspended());
|
| - if (!executionContext || executionContext->IsContextDestroyed())
|
| + if (!executionContext || executionContext->IsContextSuspended() ||
|
| + executionContext->IsContextDestroyed())
|
| return;
|
| if (!m_scriptState->ContextIsValid())
|
| return;
|
| @@ -59,8 +59,8 @@
|
| bool V8TestCallbackInterface::booleanMethod() {
|
| ExecutionContext* executionContext =
|
| ExecutionContext::From(m_scriptState.Get());
|
| - DCHECK(!executionContext->IsContextSuspended());
|
| - if (!executionContext || executionContext->IsContextDestroyed())
|
| + if (!executionContext || executionContext->IsContextSuspended() ||
|
| + executionContext->IsContextDestroyed())
|
| return true;
|
| if (!m_scriptState->ContextIsValid())
|
| return true;
|
| @@ -84,8 +84,8 @@
|
| void V8TestCallbackInterface::voidMethodBooleanArg(bool boolArg) {
|
| ExecutionContext* executionContext =
|
| ExecutionContext::From(m_scriptState.Get());
|
| - DCHECK(!executionContext->IsContextSuspended());
|
| - if (!executionContext || executionContext->IsContextDestroyed())
|
| + if (!executionContext || executionContext->IsContextSuspended() ||
|
| + executionContext->IsContextDestroyed())
|
| return;
|
| if (!m_scriptState->ContextIsValid())
|
| return;
|
| @@ -107,8 +107,8 @@
|
| void V8TestCallbackInterface::voidMethodSequenceArg(const HeapVector<Member<TestInterfaceEmpty>>& sequenceArg) {
|
| ExecutionContext* executionContext =
|
| ExecutionContext::From(m_scriptState.Get());
|
| - DCHECK(!executionContext->IsContextSuspended());
|
| - if (!executionContext || executionContext->IsContextDestroyed())
|
| + if (!executionContext || executionContext->IsContextSuspended() ||
|
| + executionContext->IsContextDestroyed())
|
| return;
|
| if (!m_scriptState->ContextIsValid())
|
| return;
|
| @@ -130,8 +130,8 @@
|
| void V8TestCallbackInterface::voidMethodFloatArg(float floatArg) {
|
| ExecutionContext* executionContext =
|
| ExecutionContext::From(m_scriptState.Get());
|
| - DCHECK(!executionContext->IsContextSuspended());
|
| - if (!executionContext || executionContext->IsContextDestroyed())
|
| + if (!executionContext || executionContext->IsContextSuspended() ||
|
| + executionContext->IsContextDestroyed())
|
| return;
|
| if (!m_scriptState->ContextIsValid())
|
| return;
|
| @@ -153,8 +153,8 @@
|
| void V8TestCallbackInterface::voidMethodTestInterfaceEmptyArg(TestInterfaceEmpty* testInterfaceEmptyArg) {
|
| ExecutionContext* executionContext =
|
| ExecutionContext::From(m_scriptState.Get());
|
| - DCHECK(!executionContext->IsContextSuspended());
|
| - if (!executionContext || executionContext->IsContextDestroyed())
|
| + if (!executionContext || executionContext->IsContextSuspended() ||
|
| + executionContext->IsContextDestroyed())
|
| return;
|
| if (!m_scriptState->ContextIsValid())
|
| return;
|
| @@ -176,8 +176,8 @@
|
| void V8TestCallbackInterface::voidMethodTestInterfaceEmptyStringArg(TestInterfaceEmpty* testInterfaceEmptyArg, const String& stringArg) {
|
| ExecutionContext* executionContext =
|
| ExecutionContext::From(m_scriptState.Get());
|
| - DCHECK(!executionContext->IsContextSuspended());
|
| - if (!executionContext || executionContext->IsContextDestroyed())
|
| + if (!executionContext || executionContext->IsContextSuspended() ||
|
| + executionContext->IsContextDestroyed())
|
| return;
|
| if (!m_scriptState->ContextIsValid())
|
| return;
|
| @@ -200,8 +200,8 @@
|
| void V8TestCallbackInterface::callbackWithThisValueVoidMethodStringArg(ScriptValue thisValue, const String& stringArg) {
|
| ExecutionContext* executionContext =
|
| ExecutionContext::From(m_scriptState.Get());
|
| - DCHECK(!executionContext->IsContextSuspended());
|
| - if (!executionContext || executionContext->IsContextDestroyed())
|
| + if (!executionContext || executionContext->IsContextSuspended() ||
|
| + executionContext->IsContextDestroyed())
|
| return;
|
| if (!m_scriptState->ContextIsValid())
|
| return;
|
|
|