Index: Source/modules/webmidi/MIDIAccess.h |
diff --git a/Source/modules/webmidi/MIDIAccess.h b/Source/modules/webmidi/MIDIAccess.h |
index f5bb3d7710a7312dcfc34674b839029b9c76999a..132cc3d64647e16fddcf56be232ae138366a0318 100644 |
--- a/Source/modules/webmidi/MIDIAccess.h |
+++ b/Source/modules/webmidi/MIDIAccess.h |
@@ -37,14 +37,16 @@ |
#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 MIDIInput; |
+class MIDIInputMap; |
+class MIDIOutput; |
+class MIDIOutputMap; |
struct MIDIOptions; |
class MIDIAccess FINAL : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MIDIAccess>, public ActiveDOMObject, public EventTargetWithInlineData, public MIDIAccessorClient { |
@@ -60,8 +62,8 @@ public: |
} |
virtual ~MIDIAccess(); |
- MIDIInputVector inputs() const { return m_inputs; } |
- MIDIOutputVector outputs() const { return m_outputs; } |
+ MIDIInputMap* inputs() const; |
+ MIDIOutputMap* outputs() const; |
DEFINE_ATTRIBUTE_EVENT_LISTENER(connect); |
DEFINE_ATTRIBUTE_EVENT_LISTENER(disconnect); |
@@ -96,8 +98,8 @@ private: |
OwnPtr<MIDIAccessor> m_accessor; |
bool m_sysexEnabled; |
- MIDIInputVector m_inputs; |
- MIDIOutputVector m_outputs; |
+ HeapVector<Member<MIDIInput> > m_inputs; |
+ HeapVector<Member<MIDIOutput> > m_outputs; |
}; |
} // namespace blink |