Add ScriptPromiseResolver::detach

third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolver.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 
 namespace blink {
 
 ScriptPromiseResolver::ScriptPromiseResolver(ScriptState* scriptState)
     : ActiveDOMObject(scriptState->executionContext())
     , m_state(Pending)
     , m_scriptState(scriptState)
     , m_timer(this, &ScriptPromiseResolver::onTimerFired)
     , m_resolver(scriptState)
 #if ENABLE(ASSERT)
     , m_isPromiseCalled(false)
 #endif
 {
     if (executionContext()->activeDOMObjectsAreStopped()) {
-        m_state = ResolvedOrRejected;
+        m_state = Detached;
         m_resolver.clear();
     }
 }
 
 void ScriptPromiseResolver::suspend()
 {
     m_timer.stop();
 }
 
 void ScriptPromiseResolver::resume()
 {
     if (m_state == Resolving || m_state == Rejecting)
         m_timer.startOneShot(0, BLINK_FROM_HERE);
 }
 
-void ScriptPromiseResolver::stop()
+void ScriptPromiseResolver::detach()
 {
+    if (m_state == Detached)
+        return;
     m_timer.stop();
-    clear();
+    m_state = Detached;
+    m_resolver.clear();
+    m_value.clear();
+    m_keepAlive.clear();
 }
 
 void ScriptPromiseResolver::keepAliveWhilePending()
 {
     // keepAliveWhilePending() will be called twice if the resolver
     // is created in a suspended execution context and the resolver
     // is then resolved/rejected while in that suspended state.
-    if (m_state == ResolvedOrRejected || m_keepAlive)
+    if (m_state == Detached || m_keepAlive)
         return;
 
     // Keep |this| around while the promise is Pending;
-    // see clear() for the dual operation.
+    // see detach() for the dual operation.
     m_keepAlive = this;
 }
 
 void ScriptPromiseResolver::onTimerFired(Timer<ScriptPromiseResolver>*)
 {
     ASSERT(m_state == Resolving || m_state == Rejecting);
     if (!scriptState()->contextIsValid()) {
-        clear();
+        detach();
         return;
     }
 
     ScriptState::Scope scope(m_scriptState.get());
     resolveOrRejectImmediately();
 }
 
 void ScriptPromiseResolver::resolveOrRejectImmediately()
 {
     ASSERT(!executionContext()->activeDOMObjectsAreStopped());
     ASSERT(!executionContext()->activeDOMObjectsAreSuspended());
     {
         if (m_state == Resolving) {
             m_resolver.resolve(m_value.newLocal(m_scriptState->isolate()));
         } else {
             ASSERT(m_state == Rejecting);
             m_resolver.reject(m_value.newLocal(m_scriptState->isolate()));
         }
     }
-    clear();
-}
-
-void ScriptPromiseResolver::clear()
-{
-    if (m_state == ResolvedOrRejected)
-        return;
-    m_state = ResolvedOrRejected;
-    m_resolver.clear();
-    m_value.clear();
-    m_keepAlive.clear();
+    detach();
 }
 
 DEFINE_TRACE(ScriptPromiseResolver)
 {
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink