Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1764)

Unified Diff: Source/modules/webmidi/MIDIAccess.h

Issue 77773003: Make WebMIDI use blink Promise. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/webmidi/MIDIAccess.h
diff --git a/Source/modules/webmidi/MIDIAccess.h b/Source/modules/webmidi/MIDIAccess.h
index a683b042b0839a19bd7010bf426a8e1455fe88f7..ae4cc5dd492c68fe9d89947e6483195ee7ca4c4c 100644
--- a/Source/modules/webmidi/MIDIAccess.h
+++ b/Source/modules/webmidi/MIDIAccess.h
@@ -31,6 +31,8 @@
#ifndef MIDIAccess_h
#define MIDIAccess_h
+#include "bindings/v8/MIDIAccessResolver.h"
+#include "bindings/v8/ScriptPromise.h"
#include "bindings/v8/ScriptWrappable.h"
#include "core/dom/ActiveDOMObject.h"
#include "core/events/EventTarget.h"
@@ -38,21 +40,22 @@
#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 "platform/AsyncMethodRunner.h"
#include "wtf/RefCounted.h"
#include "wtf/RefPtr.h"
-#include "wtf/Vector.h"
namespace WebCore {
class ExecutionContext;
-class MIDIAccessPromise;
class MIDIAccess FINAL : public RefCountedWillBeRefCountedGarbageCollected<MIDIAccess>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MIDIAccessorClient {
DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<MIDIAccess>);
public:
virtual ~MIDIAccess();
- static PassRefPtrWillBeRawPtr<MIDIAccess> create(ExecutionContext*, MIDIAccessPromise*);
+ // Returns a promise object that will be resolved with this MIDIAccess.
+ static ScriptPromise request(const MIDIOptions&, ExecutionContext*);
MIDIInputVector inputs() const { return m_inputs; }
MIDIOutputVector outputs() const { return m_outputs; }
@@ -68,7 +71,10 @@ public:
virtual ExecutionContext* executionContext() const OVERRIDE { return ActiveDOMObject::executionContext(); }
// ActiveDOMObject
+ virtual void suspend() OVERRIDE;
+ virtual void resume() OVERRIDE;
virtual void stop() OVERRIDE;
+ virtual bool hasPendingActivity() const OVERRIDE;
// MIDIAccessorClient
virtual void didAddInputPort(const String& id, const String& manufacturer, const String& name, const String& version) OVERRIDE;
@@ -82,19 +88,35 @@ public:
void trace(Visitor*);
private:
- MIDIAccess(ExecutionContext*, MIDIAccessPromise*);
+ class PostAction;
+ enum State {
+ Requesting,
+ Resolved,
+ Stopped,
+ };
+
+ MIDIAccess(const MIDIOptions&, ExecutionContext*);
+ ScriptPromise startRequest();
- void startRequest();
void permissionDenied();
+ void resolve();
+ void reject(PassRefPtr<DOMError>);
+ void resolveNow();
+ void rejectNow();
+ // Called when the promise is resolved or rejected.
+ void doPostAction(State);
+
+ State m_state;
MIDIInputVector m_inputs;
MIDIOutputVector m_outputs;
- RawPtrWillBeMember<MIDIAccessPromise> m_promise;
-
OwnPtr<MIDIAccessor> m_accessor;
- bool m_hasAccess;
+ OwnPtr<MIDIAccessResolver> m_resolver;
+ MIDIOptions m_options;
bool m_sysExEnabled;
- bool m_requesting;
+ AsyncMethodRunner<MIDIAccess> m_asyncResolveRunner;
+ AsyncMethodRunner<MIDIAccess> m_asyncRejectRunner;
+ RefPtr<DOMError> m_error;
};
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698