Introduce MIDIInputMap and MIDIOutputMap.

Source/modules/webmidi/MIDIAccess.cpp

 /*
  * 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 19 matching lines @@
 
 #include "config.h"
 #include "modules/webmidi/MIDIAccess.h"
 
 #include "core/dom/Document.h"
 #include "core/loader/DocumentLoadTiming.h"
 #include "core/loader/DocumentLoader.h"
 #include "modules/webmidi/MIDIAccessInitializer.h"
 #include "modules/webmidi/MIDIConnectionEvent.h"
 #include "modules/webmidi/MIDIController.h"
+#include "modules/webmidi/MIDIInput.h"
+#include "modules/webmidi/MIDIInputMap.h"
 #include "modules/webmidi/MIDIOptions.h"
+#include "modules/webmidi/MIDIOutput.h"
+#include "modules/webmidi/MIDIOutputMap.h"
 #include "modules/webmidi/MIDIPort.h"
 #include "platform/AsyncMethodRunner.h"
 #include <v8.h>
 
 namespace blink {
 
 MIDIAccess::MIDIAccess(PassOwnPtr<MIDIAccessor> accessor, bool sysexEnabled, const Vector<MIDIAccessInitializer::PortDescriptor>& ports, ExecutionContext* executionContext)
     : ActiveDOMObject(executionContext)
     , m_accessor(accessor)
     , m_sysexEnabled(sysexEnabled)
 {
     ScriptWrappable::init(this);
     m_accessor->setClient(this);
+    HeapHashMap<String, Member<MIDIInput> > inputs;
+    HeapHashMap<String, Member<MIDIOutput> > outputs;
     for (size_t i = 0; i < ports.size(); ++i) {
         const MIDIAccessInitializer::PortDescriptor& port = ports[i];
         if (port.type == MIDIPort::MIDIPortTypeInput) {
-            m_inputs.append(MIDIInput::create(this, port.id, port.manufacturer, port.name, port.version));
+            inputs.add(port.id, MIDIInput::create(this, port.id, port.manufacturer, port.name, port.version));
+            m_inputKeys.append(port.id);
         } else {
-            m_outputs.append(MIDIOutput::create(this, m_outputs.size(), port.id, port.manufacturer, port.name, port.version));
+            outputs.add(port.id, MIDIOutput::create(this, outputs.size(), port.id, port.manufacturer, port.name, port.version));
         }
     }
+    if (inputs.size() + outputs.size() != ports.size()) {
+        // There are id-duplicate ports that violate the spec.
+        return;
+    }
+    m_inputs = new MIDIInputMap(inputs);
+    m_outputs = new MIDIOutputMap(outputs);
 }
 
 MIDIAccess::~MIDIAccess()
 {
 }
 
 void MIDIAccess::didAddInputPort(const String& id, const String& manufacturer, const String& name, const String& version)
 {
     ASSERT(isMainThread());
-    m_inputs.append(MIDIInput::create(this, id, manufacturer, name, version));
+    // We currently assume no ports will be added once an MIDIAccess object is

[haraken, 2014/08/31 07:18:57]

will be added once => are added after

[yhirano, 2014/09/01 02:22:10]

Done.

+    // created.
+    ASSERT_NOT_REACHED();
 }
 
 void MIDIAccess::didAddOutputPort(const String& id, const String& manufacturer, const String& name, const String& version)
 {
     ASSERT(isMainThread());
-    unsigned portIndex = m_outputs.size();
-    m_outputs.append(MIDIOutput::create(this, portIndex, id, manufacturer, name, version));
+    // We currently assume no ports will be added once an MIDIAccess object is
+    // created.

[haraken, 2014/08/31 07:18:57]

will be added once => are added after

[yhirano, 2014/09/01 02:22:10]

Done.

+    ASSERT_NOT_REACHED();
 }
 
 void MIDIAccess::didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStamp)
 {
     ASSERT(isMainThread());
-    if (portIndex >= m_inputs.size())
+    if (portIndex >= m_inputs->size())
         return;
 
     // Convert from time in seconds which is based on the time coordinate system of monotonicallyIncreasingTime()
     // into time in milliseconds (a DOMHighResTimeStamp) according to the same time coordinate system as performance.now().
     // This is how timestamps are defined in the Web MIDI spec.
     Document* document = toDocument(executionContext());
     ASSERT(document);
 
     double timeStampInMilliseconds = 1000 * document->loader()->timing()->monotonicTimeToZeroBasedDocumentTime(timeStamp);
 
-    m_inputs[portIndex]->didReceiveMIDIData(portIndex, data, length, timeStampInMilliseconds);
+    ASSERT(m_inputs->has(m_inputKeys[portIndex]));
+    m_inputs->get(m_inputKeys[portIndex])->didReceiveMIDIData(portIndex, data, length, timeStampInMilliseconds);
 }
 
 void MIDIAccess::sendMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStampInMilliseconds)
 {
-    if (!data || !length || portIndex >= m_outputs.size())
+    if (!data || !length || portIndex >= m_outputs->size())
         return;
     // Convert from a time in milliseconds (a DOMHighResTimeStamp) according to the same time coordinate system as performance.now()
     // into a time in seconds which is based on the time coordinate system of monotonicallyIncreasingTime().
     double timeStamp;
 
     if (!timeStampInMilliseconds) {
         // We treat a value of 0 (which is the default value) as special, meaning "now".
         // We need to translate it exactly to 0 seconds.
         timeStamp = 0;
     } else {
@@ skipping 12 matching lines @@
 }
 
 void MIDIAccess::trace(Visitor* visitor)
 {
     visitor->trace(m_inputs);
     visitor->trace(m_outputs);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace blink