Revert of Introduce KeepAliveWhilePending to ScriptPromiseResolverWithContext.

Source/bindings/v8/ScriptPromiseResolverWithContext.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 "config.h"
 #include "bindings/v8/ScriptPromiseResolverWithContext.h"
 
 #include "bindings/v8/V8RecursionScope.h"
 
 namespace WebCore {
 
-ScriptPromiseResolverWithContext::ScriptPromiseResolverWithContext(ScriptState* scriptState, Mode mode)
+ScriptPromiseResolverWithContext::ScriptPromiseResolverWithContext(ScriptState* scriptState)
     : ActiveDOMObject(scriptState->executionContext())
     , m_state(Pending)
     , m_scriptState(scriptState)
-    , m_mode(mode)
     , m_timer(this, &ScriptPromiseResolverWithContext::onTimerFired)
     , m_resolver(ScriptPromiseResolver::create(m_scriptState.get()))
 {
-    if (mode == KeepAliveWhilePending) {
-        // In order to call ref() here, I relax the adoption requirement.
-        // adoptRef is required neverthless.
-        relaxAdoptionRequirement();
-        // Keep |this| while the promise is Pending.
-        // deref() will be called in clear().
-        ref();
-    }
-}
-
-ScriptPromiseResolverWithContext::~ScriptPromiseResolverWithContext()
-{
-    if (m_state != ResolvedOrRejected) {
-        ScriptState::Scope scope(m_scriptState.get());
-        reject(v8::Exception::Error(v8::String::NewFromUtf8(m_scriptState->isolate(),
-            "ScriptPromiseResolverWithContext is destructed without resolve / reject")));
-    }
 }
 
 void ScriptPromiseResolverWithContext::suspend()
 {
     m_timer.stop();
 }
 
 void ScriptPromiseResolverWithContext::resume()
 {
     if (m_state == Resolving || m_state == Rejecting)
         m_timer.startOneShot(0, FROM_HERE);
 }
 
 void ScriptPromiseResolverWithContext::stop()
 {
     m_timer.stop();
     clear();
 }
 
 void ScriptPromiseResolverWithContext::onTimerFired(Timer<ScriptPromiseResolverWithContext>*)
 {
+    RefPtr<ScriptPromiseResolverWithContext> protect(this);
     ScriptState::Scope scope(m_scriptState.get());
     resolveOrRejectImmediately();
 }
 
 void ScriptPromiseResolverWithContext::resolveOrRejectImmediately()
 {
     ASSERT(!executionContext()->activeDOMObjectsAreStopped());
     ASSERT(!executionContext()->activeDOMObjectsAreSuspended());
     {
         // FIXME: The V8RecursionScope is only necessary to force microtask delivery for promises
         // resolved or rejected in workers. It can be removed once worker threads run microtasks
         // at the end of every task (rather than just the main thread).
         V8RecursionScope scope(m_scriptState->isolate(), m_scriptState->executionContext());
         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 ScriptPromiseResolverWithContext::clear()
 {
-    if (m_state == ResolvedOrRejected)
-        return;
     ResolutionState state = m_state;
     m_state = ResolvedOrRejected;
     m_resolver.clear();
     m_value.clear();
-    if (m_mode == KeepAliveWhilePending) {
-        // |ref| was called in the constructor.
-        deref();
-    }
-    // |this| may be deleted here, but it is safe to check |state| because
-    // it doesn't depend on |this|. When |this| is deleted, |state| can't be
-    // |Resolving| nor |Rejecting| and hence |this->deref()| can't be executed.
     if (state == Resolving || state == Rejecting) {
         // |ref| was called in |resolveOrReject|.
         deref();
     }
+    // |this| may be deleted here.
 }
 
 } // namespace WebCore