Make WebMIDI use blink Promise.

Source/modules/webmidi/MIDIAccess.h

 /*
  * 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.
  */
 
 #ifndef MIDIAccess_h
 #define MIDIAccess_h
 
+#include "bindings/v8/DOMRequestState.h"
+#include "bindings/v8/ScriptPromise.h"
+#include "bindings/v8/ScriptPromiseResolver.h"
 #include "bindings/v8/ScriptWrappable.h"
 #include "core/dom/ActiveDOMObject.h"
 #include "core/events/EventTarget.h"
 #include "modules/webmidi/MIDIAccessor.h"
 #include "modules/webmidi/MIDIAccessorClient.h"
 #include "modules/webmidi/MIDIInput.h"
+#include "modules/webmidi/MIDIOptions.h"
 #include "modules/webmidi/MIDIOutput.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
 class ExecutionContext;
-class MIDIAccessPromise;
+class NavigatorWebMIDI;
 
 class MIDIAccess : public RefCounted<MIDIAccess>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MIDIAccessorClient {
     REFCOUNTED_EVENT_TARGET(MIDIAccess);
 public:
     virtual ~MIDIAccess();
-    static PassRefPtr<MIDIAccess> create(ExecutionContext*, MIDIAccessPromise*);
+    static PassRefPtr<MIDIAccess> create(const MIDIOptions&, ExecutionContext*, NavigatorWebMIDI*);
 
     MIDIInputVector inputs() const { return m_inputs; }
     MIDIOutputVector outputs() const { return m_outputs; }
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(connect);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(disconnect);
 
     void setSysExEnabled(bool);
     bool sysExEnabled() const { return m_sysExEnabled; }
 
     // EventTarget
     virtual const AtomicString& interfaceName() const OVERRIDE { return EventTargetNames::MIDIAccess; }
     virtual ExecutionContext* executionContext() const OVERRIDE { return ActiveDOMObject::executionContext(); }
 
     // ActiveDOMObject
     virtual void stop();
 
     // MIDIAccessorClient
     virtual void didAddInputPort(const String& id, const String& manufacturer, const String& name, const String& version) OVERRIDE;
     virtual void didAddOutputPort(const String& id, const String& manufacturer, const String& name, const String& version) OVERRIDE;
     virtual void didStartSession(bool success) OVERRIDE;
     virtual void didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStamp) OVERRIDE;
 
     // |timeStampInMilliseconds| is in the same time coordinate system as performance.now().
     void sendMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStampInMilliseconds);
 
+    ScriptPromise startRequest();
+
 private:
-    MIDIAccess(ExecutionContext*, MIDIAccessPromise*);
+    MIDIAccess(const MIDIOptions&, ExecutionContext*, NavigatorWebMIDI*);
 
-    void startRequest();
     virtual void permissionDenied();
+    // This method can delete |this| object.
+    void resolve();
+    // This method can delete |this| object.
+    void reject(PassRefPtr<DOMError>);
+
+    // A NavigatorWebMIDI holds this MIDIAccess object as long as it is
+    // a PENDING state. Once the request succeeds or fails this object
+    // deregister itself from the navigator object.
+    // the navigator will call |stop| method when it goes invalid
+    // and then |m_navigator| will be cleard.
+    NavigatorWebMIDI* m_navigator;
 
     MIDIInputVector m_inputs;
     MIDIOutputVector m_outputs;
-    MIDIAccessPromise* m_promise;
 
     OwnPtr<MIDIAccessor> m_accessor;
+    DOMRequestState m_requestState;

[abarth-chromium, 2013/12/04 06:05:14]

DOMRequestState isn't designed to be held in the heap.  It's meant to just be
used on the stack.  For example, it holds a raw pointer to an ExecutionContext.

[yhirano, 2013/12/05 08:19:12]

Done.
MIDIAccessor now stores a DOMWrapperWorld.

+    RefPtr<ScriptPromiseResolver> m_resolver;
+    MIDIOptions m_options;
     bool m_hasAccess;
     bool m_sysExEnabled;
     bool m_requesting;
 };
 
 } // namespace WebCore
 
 #endif // MIDIAccess_h