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

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

Issue 513203002: Introduce MIDIInputMap and MIDIOutputMap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@iterator-adhoc
Patch Set: Created 6 years, 4 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 92a6388bd033fc5fcefdff97c9fbe1858158ce9e..63c4ffd204507756de77e1aef73e496894e96249 100644
--- a/Source/modules/webmidi/MIDIAccess.h
+++ b/Source/modules/webmidi/MIDIAccess.h
@@ -37,14 +37,14 @@
#include "modules/webmidi/MIDIAccessInitializer.h"
#include "modules/webmidi/MIDIAccessor.h"
#include "modules/webmidi/MIDIAccessorClient.h"
-#include "modules/webmidi/MIDIInput.h"
-#include "modules/webmidi/MIDIOutput.h"
#include "platform/heap/Handle.h"
#include "wtf/Vector.h"
namespace blink {
class ExecutionContext;
+class MIDIInputMap;
+class MIDIOutputMap;
struct MIDIOptions;
class MIDIAccess FINAL : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MIDIAccess>, public ActiveDOMObject, public EventTargetWithInlineData, public MIDIAccessorClient {
@@ -59,8 +59,8 @@ public:
}
virtual ~MIDIAccess();
- MIDIInputVector inputs() const { return m_inputs; }
- MIDIOutputVector outputs() const { return m_outputs; }
+ MIDIInputMap* inputs() const { return m_inputs; }
+ MIDIOutputMap* outputs() const { return m_outputs; }
DEFINE_ATTRIBUTE_EVENT_LISTENER(connect);
DEFINE_ATTRIBUTE_EVENT_LISTENER(disconnect);
@@ -95,8 +95,9 @@ private:
OwnPtr<MIDIAccessor> m_accessor;
bool m_sysexEnabled;
- MIDIInputVector m_inputs;
- MIDIOutputVector m_outputs;
+ Vector<String> m_inputKeys;
+ Member<MIDIInputMap> m_inputs;
+ Member<MIDIOutputMap> m_outputs;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698