Make WebMIDI use blink Promise.

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 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/NavigatorWebMIDI.h"
 
+#include "bindings/v8/DOMRequestState.h"

[haraken, 2014/03/13 02:22:33]

Nit: This won't be necessary. Please clean up #includes in this CL.

[yhirano, 2014/03/13 05:43:22]

Done.

+#include "bindings/v8/ScriptPromise.h"
+#include "bindings/v8/ScriptPromiseResolver.h"
+#include "core/dom/DOMError.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
-#include "modules/webmidi/MIDIAccessPromise.h"
+#include "modules/webmidi/MIDIAccess.h"
+#include "modules/webmidi/MIDIOptions.h"
 
 namespace WebCore {
 
 NavigatorWebMIDI::NavigatorWebMIDI(LocalFrame* frame)
     : DOMWindowProperty(frame)
 {
 }
 
 NavigatorWebMIDI::~NavigatorWebMIDI()
 {
 }
 
 const char* NavigatorWebMIDI::supplementName()
 {
     return "NavigatorWebMIDI";
 }
 
 NavigatorWebMIDI& NavigatorWebMIDI::from(Navigator& navigator)
 {
     NavigatorWebMIDI* supplement = static_cast<NavigatorWebMIDI*>(Supplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
         supplement = new NavigatorWebMIDI(navigator.frame());
         provideTo(navigator, supplementName(), adoptPtr(supplement));
     }
     return *supplement;
 }
 
-PassRefPtrWillBeRawPtr<MIDIAccessPromise> NavigatorWebMIDI::requestMIDIAccess(Navigator& navigator, const Dictionary& options)
+ScriptPromise NavigatorWebMIDI::requestMIDIAccess(Navigator& navigator, const Dictionary& options)
 {
     return NavigatorWebMIDI::from(navigator).requestMIDIAccess(options);
 }
 
-PassRefPtrWillBeRawPtr<MIDIAccessPromise> NavigatorWebMIDI::requestMIDIAccess(const Dictionary& options)
+ScriptPromise NavigatorWebMIDI::requestMIDIAccess(const Dictionary& options)
 {
-    if (!frame())
-        return nullptr;
+    if (!frame()) {
+        ScriptPromise promise = ScriptPromise::createPending();

[haraken, 2014/03/13 02:22:33]

At this point, Frame is dead. On which context is the ScriptPromise created?

[yhirano, 2014/03/13 05:43:22]

It's the calling context.
requestmidiaccess-in-detached-frame.html[1] which is added in this CL covers
this code block.
Please note that the coming V8 Promise[2] doesn't have a wrapper and we won't
need creationContext.

[1]
https://codereview.chromium.org/77773003/diff/1200001/LayoutTests/webmidi/req...
[2] https://codereview.chromium.org/194663003/diff/20001/include/v8.h

+        RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(promise);
+        // FIXME: Currently this rejection does not work because the context is stopped.
+        resolver->reject(DOMError::create("AbortError"));
+        return promise;
+    }
 
-    ExecutionContext* context = frame()->document();
-    ASSERT(context);
-
-    return MIDIAccessPromise::create(context, options);
+    return MIDIAccess::request(MIDIOptions(options), frame()->document());
 }
 
 } // namespace WebCore