| Index: third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolver.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolver.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolver.cpp
|
| index 129a190f6969e41815f1454aaf41883ed0f24bf9..14bd407d153c5fcf3452325b0752f2b26e1d6e58 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolver.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolver.cpp
|
| @@ -19,7 +19,7 @@ ScriptPromiseResolver::ScriptPromiseResolver(ScriptState* scriptState)
|
| m_isPromiseCalled(false)
|
| #endif
|
| {
|
| - if (getExecutionContext()->activeDOMObjectsAreStopped()) {
|
| + if (getExecutionContext()->isContextDestroyed()) {
|
| m_state = Detached;
|
| m_resolver.clear();
|
| }
|
| @@ -71,8 +71,8 @@ void ScriptPromiseResolver::onTimerFired(TimerBase*) {
|
| }
|
|
|
| void ScriptPromiseResolver::resolveOrRejectImmediately() {
|
| - ASSERT(!getExecutionContext()->activeDOMObjectsAreStopped());
|
| - ASSERT(!getExecutionContext()->activeDOMObjectsAreSuspended());
|
| + DCHECK(!getExecutionContext()->isContextDestroyed());
|
| + DCHECK(!getExecutionContext()->activeDOMObjectsAreSuspended());
|
| {
|
| InspectorInstrumentation::AsyncTask asyncTask(getExecutionContext(), this);
|
| if (m_state == Resolving) {
|
|
|