Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolver.cpp

Issue 2552993002: Rename activeDOMObjectsAreStopped to isContextDestroyed (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "bindings/core/v8/ScriptPromiseResolver.h" 5 #include "bindings/core/v8/ScriptPromiseResolver.h"
6 6
7 #include "core/inspector/InspectorInstrumentation.h" 7 #include "core/inspector/InspectorInstrumentation.h"
8 8
9 namespace blink { 9 namespace blink {
10 10
11 ScriptPromiseResolver::ScriptPromiseResolver(ScriptState* scriptState) 11 ScriptPromiseResolver::ScriptPromiseResolver(ScriptState* scriptState)
12 : ActiveDOMObject(scriptState->getExecutionContext()), 12 : ActiveDOMObject(scriptState->getExecutionContext()),
13 m_state(Pending), 13 m_state(Pending),
14 m_scriptState(scriptState), 14 m_scriptState(scriptState),
15 m_timer(this, &ScriptPromiseResolver::onTimerFired), 15 m_timer(this, &ScriptPromiseResolver::onTimerFired),
16 m_resolver(scriptState) 16 m_resolver(scriptState)
17 #if ENABLE(ASSERT) 17 #if ENABLE(ASSERT)
18 , 18 ,
19 m_isPromiseCalled(false) 19 m_isPromiseCalled(false)
20 #endif 20 #endif
21 { 21 {
22 if (getExecutionContext()->activeDOMObjectsAreStopped()) { 22 if (getExecutionContext()->isContextDestroyed()) {
23 m_state = Detached; 23 m_state = Detached;
24 m_resolver.clear(); 24 m_resolver.clear();
25 } 25 }
26 InspectorInstrumentation::asyncTaskScheduled(getExecutionContext(), "Promise", 26 InspectorInstrumentation::asyncTaskScheduled(getExecutionContext(), "Promise",
27 this); 27 this);
28 } 28 }
29 29
30 void ScriptPromiseResolver::suspend() { 30 void ScriptPromiseResolver::suspend() {
31 m_timer.stop(); 31 m_timer.stop();
32 } 32 }
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 if (!getScriptState()->contextIsValid()) { 64 if (!getScriptState()->contextIsValid()) {
65 detach(); 65 detach();
66 return; 66 return;
67 } 67 }
68 68
69 ScriptState::Scope scope(m_scriptState.get()); 69 ScriptState::Scope scope(m_scriptState.get());
70 resolveOrRejectImmediately(); 70 resolveOrRejectImmediately();
71 } 71 }
72 72
73 void ScriptPromiseResolver::resolveOrRejectImmediately() { 73 void ScriptPromiseResolver::resolveOrRejectImmediately() {
74 ASSERT(!getExecutionContext()->activeDOMObjectsAreStopped()); 74 DCHECK(!getExecutionContext()->isContextDestroyed());
75 ASSERT(!getExecutionContext()->activeDOMObjectsAreSuspended()); 75 DCHECK(!getExecutionContext()->activeDOMObjectsAreSuspended());
76 { 76 {
77 InspectorInstrumentation::AsyncTask asyncTask(getExecutionContext(), this); 77 InspectorInstrumentation::AsyncTask asyncTask(getExecutionContext(), this);
78 if (m_state == Resolving) { 78 if (m_state == Resolving) {
79 m_resolver.resolve(m_value.newLocal(m_scriptState->isolate())); 79 m_resolver.resolve(m_value.newLocal(m_scriptState->isolate()));
80 } else { 80 } else {
81 ASSERT(m_state == Rejecting); 81 ASSERT(m_state == Rejecting);
82 m_resolver.reject(m_value.newLocal(m_scriptState->isolate())); 82 m_resolver.reject(m_value.newLocal(m_scriptState->isolate()));
83 } 83 }
84 } 84 }
85 detach(); 85 detach();
86 } 86 }
87 87
88 DEFINE_TRACE(ScriptPromiseResolver) { 88 DEFINE_TRACE(ScriptPromiseResolver) {
89 ActiveDOMObject::trace(visitor); 89 ActiveDOMObject::trace(visitor);
90 } 90 }
91 91
92 } // namespace blink 92 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698