| 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 bc0ba8d0f7613a45b14907867731ce8af4efae42..c673c46be675863e8c951dbcb08ed82f3c8f39fe 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolver.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolver.cpp
|
| @@ -7,7 +7,7 @@
|
| namespace blink {
|
|
|
| ScriptPromiseResolver::ScriptPromiseResolver(ScriptState* scriptState)
|
| - : ActiveDOMObject(scriptState->executionContext())
|
| + : ActiveDOMObject(scriptState->getExecutionContext())
|
| , m_state(Pending)
|
| , m_scriptState(scriptState)
|
| , m_timer(this, &ScriptPromiseResolver::onTimerFired)
|
| @@ -16,7 +16,7 @@ ScriptPromiseResolver::ScriptPromiseResolver(ScriptState* scriptState)
|
| , m_isPromiseCalled(false)
|
| #endif
|
| {
|
| - if (executionContext()->activeDOMObjectsAreStopped()) {
|
| + if (getExecutionContext()->activeDOMObjectsAreStopped()) {
|
| m_state = Detached;
|
| m_resolver.clear();
|
| }
|
| @@ -60,7 +60,7 @@ void ScriptPromiseResolver::keepAliveWhilePending()
|
| void ScriptPromiseResolver::onTimerFired(Timer<ScriptPromiseResolver>*)
|
| {
|
| ASSERT(m_state == Resolving || m_state == Rejecting);
|
| - if (!scriptState()->contextIsValid()) {
|
| + if (!getScriptState()->contextIsValid()) {
|
| detach();
|
| return;
|
| }
|
| @@ -71,8 +71,8 @@ void ScriptPromiseResolver::onTimerFired(Timer<ScriptPromiseResolver>*)
|
|
|
| void ScriptPromiseResolver::resolveOrRejectImmediately()
|
| {
|
| - ASSERT(!executionContext()->activeDOMObjectsAreStopped());
|
| - ASSERT(!executionContext()->activeDOMObjectsAreSuspended());
|
| + ASSERT(!getExecutionContext()->activeDOMObjectsAreStopped());
|
| + ASSERT(!getExecutionContext()->activeDOMObjectsAreSuspended());
|
| {
|
| if (m_state == Resolving) {
|
| m_resolver.resolve(m_value.newLocal(m_scriptState->isolate()));
|
|
|