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

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

Issue 17619003: Fulfill or reject MIDIAccessPromise from MIDIAccessor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: move layout test from fast/webmidi to webmidi Created 7 years, 6 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
« no previous file with comments | « LayoutTests/webmidi/requestmidiaccess-expected.txt ('k') | Source/modules/webmidi/MIDIAccess.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webmidi/MIDIAccess.h
diff --git a/Source/modules/webmidi/MIDIAccess.h b/Source/modules/webmidi/MIDIAccess.h
index 058b005549537311e3d3c7186170ec50a0b17b33..88447af523e09427be3c819226db8e8925ea7f9b 100644
--- a/Source/modules/webmidi/MIDIAccess.h
+++ b/Source/modules/webmidi/MIDIAccess.h
@@ -34,6 +34,8 @@
#include "bindings/v8/ScriptWrappable.h"
#include "core/dom/ActiveDOMObject.h"
#include "core/dom/EventTarget.h"
+#include "core/platform/midi/MIDIAccessor.h"
+#include "core/platform/midi/MIDIAccessorClient.h"
#include "modules/webmidi/MIDIInput.h"
#include "modules/webmidi/MIDIOutput.h"
#include "wtf/RefCounted.h"
@@ -45,7 +47,7 @@ namespace WebCore {
class ScriptExecutionContext;
class MIDIAccessPromise;
-class MIDIAccess : public RefCounted<MIDIAccess>, public ScriptWrappable, public ActiveDOMObject, public EventTarget {
+class MIDIAccess : public RefCounted<MIDIAccess>, public ScriptWrappable, public ActiveDOMObject, public EventTarget, public MIDIAccessorClient {
public:
virtual ~MIDIAccess();
static PassRefPtr<MIDIAccess> create(ScriptExecutionContext*, MIDIAccessPromise*);
@@ -66,6 +68,13 @@ public:
// ActiveDOMObject
virtual bool canSuspend() const OVERRIDE { return true; }
+ // 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 didAllowAccess() OVERRIDE;
+ virtual void didBlockAccess() OVERRIDE;
+ virtual void didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStamp) OVERRIDE;
+
private:
explicit MIDIAccess(ScriptExecutionContext*, MIDIAccessPromise*);
@@ -79,6 +88,9 @@ private:
MIDIOutputVector m_outputs;
EventTargetData m_eventTargetData;
MIDIAccessPromise* m_promise;
+
+ OwnPtr<MIDIAccessor> m_accessor;
+ bool m_hasAccess;
};
} // namespace WebCore
« no previous file with comments | « LayoutTests/webmidi/requestmidiaccess-expected.txt ('k') | Source/modules/webmidi/MIDIAccess.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698