Introduce KeepAliveWhilePending to ScriptPromiseResolverWithContext.

Source/modules/webmidi/NavigatorWebMIDI.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 19 matching lines @@
 
 #include "config.h"
 #include "modules/webmidi/NavigatorWebMIDI.h"
 
 #include "bindings/v8/ScriptPromise.h"
 #include "bindings/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMError.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
-#include "modules/webmidi/MIDIAccess.h"
+#include "modules/webmidi/MIDIAccessInitializer.h"
 #include "modules/webmidi/MIDIOptions.h"
 
 namespace WebCore {
 
 NavigatorWebMIDI::NavigatorWebMIDI(LocalFrame* frame)
     : DOMWindowProperty(frame)
 {
 }
 
 NavigatorWebMIDI::~NavigatorWebMIDI()
@@ skipping 10 matching lines @@
     NavigatorWebMIDI* supplement = static_cast<NavigatorWebMIDI*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
         supplement = new NavigatorWebMIDI(navigator.frame());
         provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement));
     }
     return *supplement;
 }
 
 ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, Navigator& navigator, const Dictionary& options)
 {
-    return NavigatorWebMIDI::from(navigator).requestMIDIAccess(scriptState, options);
+    return NavigatorWebMIDI::from(navigator).requestMIDIAccessInternal(scriptState, navigator, options);
 }
 
-ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, const Dictionary& options)
+ScriptPromise NavigatorWebMIDI::requestMIDIAccessInternal(ScriptState* scriptState, Navigator& navigator, const Dictionary& options)
 {
     if (!frame() || frame()->document()->activeDOMObjectsAreStopped()) {
         RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
         ScriptPromise promise = resolver->promise();
         // FIXME: Currently this rejection does not work because the context is stopped.
         resolver->reject(DOMError::create("AbortError"));
         return promise;
     }
 
-    return MIDIAccess::request(MIDIOptions(options), scriptState);
+    const OwnPtr<MIDIAccessInitializer>& initializer =
+        *m_initializers.add(MIDIAccessInitializer::create(scriptState, MIDIOptions(options), &navigator, this)).storedValue;
+    return initializer->start();
+}
+
+void NavigatorWebMIDI::didFinishMIDIAccessInitialization(MIDIAccessInitializer* initializer)
+{
+    if (m_initializers.contains(initializer))
+        m_initializers.remove(initializer);
+}
+
+void NavigatorWebMIDI::didFailMIDIAccessInitialization(MIDIAccessInitializer* initializer)
+{
+    if (m_initializers.contains(initializer))
+        m_initializers.remove(initializer);
 }
 
 } // namespace WebCore