Revert of Introduce KeepAliveWhilePending to ScriptPromiseResolverWithContext.

Source/modules/webmidi/MIDIAccess.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/webmidi/MIDIAccess.h"
 
+#include "bindings/v8/ScriptFunction.h"
+#include "bindings/v8/ScriptPromise.h"
+#include "bindings/v8/ScriptPromiseResolverWithContext.h"
+#include "bindings/v8/V8Binding.h"
+#include "core/dom/DOMError.h"
 #include "core/dom/Document.h"
 #include "core/loader/DocumentLoadTiming.h"
 #include "core/loader/DocumentLoader.h"
 #include "modules/webmidi/MIDIAccessInitializer.h"
 #include "modules/webmidi/MIDIConnectionEvent.h"
 #include "modules/webmidi/MIDIController.h"
 #include "modules/webmidi/MIDIOptions.h"
 #include "modules/webmidi/MIDIPort.h"
 #include "platform/AsyncMethodRunner.h"
 #include <v8.h>
 
 namespace WebCore {
 
-MIDIAccess::MIDIAccess(PassOwnPtr<MIDIAccessor> accessor, bool sysexEnabled, const Vector<MIDIAccessInitializer::PortDescriptor>& ports, ExecutionContext* executionContext)
-    : ActiveDOMObject(executionContext)
-    , m_accessor(accessor)
-    , m_sysexEnabled(sysexEnabled)
+ScriptPromise MIDIAccess::request(const MIDIOptions& options, ScriptState* scriptState)
 {
-    ScriptWrappable::init(this);
-    m_accessor->setClient(this);
-    for (size_t i = 0; i < ports.size(); ++i) {
-        const MIDIAccessInitializer::PortDescriptor& port = ports[i];
-        if (port.type == MIDIPort::MIDIPortTypeInput) {
-            m_inputs.append(MIDIInput::create(this, port.id, port.manufacturer, port.name, port.version));
-        } else {
-            m_outputs.append(MIDIOutput::create(this, m_outputs.size(), port.id, port.manufacturer, port.name, port.version));
-        }
-    }
+    RefPtrWillBeRawPtr<MIDIAccess> midiAccess(adoptRefWillBeRefCountedGarbageCollected(new MIDIAccess(options, scriptState->executionContext())));
+    midiAccess->suspendIfNeeded();
+    // Create a wrapper to expose this object to the V8 GC so that
+    // hasPendingActivity takes effect.
+    toV8NoInline(midiAccess.get(), scriptState->context()->Global(), scriptState->isolate());
+    // Now this object is retained because hasPending returns true.
+    return midiAccess->m_initializer->initialize(scriptState);
 }
 
 MIDIAccess::~MIDIAccess()
 {
 }
 
+MIDIAccess::MIDIAccess(const MIDIOptions& options, ExecutionContext* context)
+    : ActiveDOMObject(context)
+    , m_initializer(MIDIAccessInitializer::create(options, this))
+{
+    ScriptWrappable::init(this);
+}
+
 void MIDIAccess::didAddInputPort(const String& id, const String& manufacturer, const String& name, const String& version)
 {
     ASSERT(isMainThread());
     m_inputs.append(MIDIInput::create(this, id, manufacturer, name, version));
 }
 
 void MIDIAccess::didAddOutputPort(const String& id, const String& manufacturer, const String& name, const String& version)
 {
     ASSERT(isMainThread());
     unsigned portIndex = m_outputs.size();
@@ skipping 35 matching lines @@
         double documentStartTime = document->loader()->timing()->referenceMonotonicTime();
         timeStamp = documentStartTime + 0.001 * timeStampInMilliseconds;
     }
 
     m_accessor->sendMIDIData(portIndex, data, length, timeStamp);
 }
 
 void MIDIAccess::stop()
 {
     m_accessor.clear();
+    m_initializer->cancel();
+}
+
+bool MIDIAccess::hasPendingActivity() const
+{
+    return m_initializer->hasPendingActivity();
+}
+
+void MIDIAccess::initialize(PassOwnPtr<MIDIAccessor> accessor, bool sysexEnabled)
+{
+    ASSERT(accessor);
+    m_accessor = accessor;
+    m_accessor->setClient(this);
+    m_sysexEnabled = sysexEnabled;
 }
 
 void MIDIAccess::trace(Visitor* visitor)
 {
     visitor->trace(m_inputs);
     visitor->trace(m_outputs);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace WebCore