Make WebMIDI use blink Promise.

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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/webmidi/MIDIAccess.h"
 
 #include "core/dom/DOMError.h"
 #include "core/dom/Document.h"
 #include "core/loader/DocumentLoadTiming.h"
 #include "core/loader/DocumentLoader.h"
-#include "modules/webmidi/MIDIAccessPromise.h"
 #include "modules/webmidi/MIDIConnectionEvent.h"
 #include "modules/webmidi/MIDIController.h"
+#include "modules/webmidi/MIDIOptions.h"
 #include "modules/webmidi/MIDIPort.h"
+#include "modules/webmidi/NavigatorWebMIDI.h"
 
 namespace WebCore {
 
-PassRefPtr<MIDIAccess> MIDIAccess::create(ExecutionContext* context, MIDIAccessPromise* promise)
+PassRefPtr<MIDIAccess> MIDIAccess::create(const MIDIOptions& options, ExecutionContext* context, NavigatorWebMIDI* navigator)
 {
-    RefPtr<MIDIAccess> midiAccess(adoptRef(new MIDIAccess(context, promise)));
+    RefPtr<MIDIAccess> midiAccess(adoptRef(new MIDIAccess(options, context, navigator)));
     midiAccess->suspendIfNeeded();
-    midiAccess->startRequest();
     return midiAccess.release();
 }
 
 MIDIAccess::~MIDIAccess()
 {
     stop();
 }
 
-MIDIAccess::MIDIAccess(ExecutionContext* context, MIDIAccessPromise* promise)
+MIDIAccess::MIDIAccess(const MIDIOptions& options, ExecutionContext* context, NavigatorWebMIDI* navigator)
     : ActiveDOMObject(context)
-    , m_promise(promise)
+    , m_navigator(navigator)
+    , m_options(options)
     , m_hasAccess(false)
     , m_sysExEnabled(false)
     , m_requesting(false)
 {
     ScriptWrappable::init(this);
     m_accessor = MIDIAccessor::create(this);
 }
 
 void MIDIAccess::setSysExEnabled(bool enable)
 {
@@ skipping 19 matching lines @@
     unsigned portIndex = m_outputs.size();
     m_outputs.append(MIDIOutput::create(this, portIndex, executionContext(), id, manufacturer, name, version));
 }
 
 void MIDIAccess::didStartSession(bool success)
 {
     ASSERT(isMainThread());
 
     m_hasAccess = success;
     if (success)
-        m_promise->fulfill();
+        m_navigator->didFinishRequest(this);
     else
-        m_promise->reject(DOMError::create("InvalidStateError"));
+        m_navigator->didFailRequest(this, DOMError::create("InvalidStateError"));
 }
 
 void MIDIAccess::didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStamp)
 {
     ASSERT(isMainThread());
 
     if (m_hasAccess && portIndex < m_inputs.size()) {
         // Convert from time in seconds which is based on the time coordinate system of monotonicallyIncreasingTime()
         // into time in milliseconds (a DOMHighResTimeStamp) according to the same time coordinate system as performance.now().
         // This is how timestamps are defined in the Web MIDI spec.
@@ skipping 27 matching lines @@
         m_accessor->sendMIDIData(portIndex, data, length, timeStamp);
     }
 }
 
 void MIDIAccess::stop()
 {
     m_hasAccess = false;
     if (!m_requesting)
         return;
     m_requesting = false;
+    m_navigator->didFailRequest(this, DOMError::create("InvalidStateError"));

[Takashi Toyoshima, 2013/12/03 10:48:50]

AbortError?

[yhirano, 2013/12/03 12:14:16]

Done.

     Document* document = toDocument(executionContext());
     ASSERT(document);
     MIDIController* controller = MIDIController::from(document->page());
     ASSERT(controller);
     controller->cancelSysExPermissionRequest(this);
 
     m_accessor.clear();
 }
 
 void MIDIAccess::startRequest()
 {
-    if (!m_promise->options()->sysex) {
+    if (!m_options.sysex) {
         m_accessor->startSession();
         return;
     }
     Document* document = toDocument(executionContext());
     ASSERT(document);
     MIDIController* controller = MIDIController::from(document->page());
     if (controller) {
         m_requesting = true;
         controller->requestSysExPermission(this);
     } else {
         permissionDenied();
     }
 }
 
 void MIDIAccess::permissionDenied()
 {
     ASSERT(isMainThread());
 
     m_hasAccess = false;
-    m_promise->reject(DOMError::create("SecurityError"));
+    m_navigator->didFailRequest(this, DOMError::create("SecurityError"));
 }
 
 } // namespace WebCore