Web MIDI: add open() and close() to MIDIPort

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 28 matching lines @@
 #include "modules/webmidi/MIDIController.h"
 #include "modules/webmidi/MIDIInput.h"
 #include "modules/webmidi/MIDIInputMap.h"
 #include "modules/webmidi/MIDIOutput.h"
 #include "modules/webmidi/MIDIOutputMap.h"
 #include "modules/webmidi/MIDIPort.h"
 #include "platform/AsyncMethodRunner.h"
 
 namespace blink {
 
+using PortState = MIDIAccessor::MIDIPortState;
+
 MIDIAccess::MIDIAccess(PassOwnPtr<MIDIAccessor> accessor, bool sysexEnabled, const Vector<MIDIAccessInitializer::PortDescriptor>& ports, ExecutionContext* executionContext)
     : ActiveDOMObject(executionContext)
     , m_accessor(accessor)
     , m_sysexEnabled(sysexEnabled)
 {
     m_accessor->setClient(this);
     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, port.isActive));
+            m_inputs.append(MIDIInput::create(this, port.id, port.manufacturer, port.name, port.version, port.state));
         } else {
-            m_outputs.append(MIDIOutput::create(this, m_outputs.size(), port.id, port.manufacturer, port.name, port.version, port.isActive));
+            m_outputs.append(MIDIOutput::create(this, m_outputs.size(), port.id, port.manufacturer, port.name, port.version, port.state));
         }
     }
 }
 
 MIDIAccess::~MIDIAccess()
 {
 }
 
 MIDIInputMap* MIDIAccess::inputs() const
 {
     HeapHashMap<String, Member<MIDIInput>> inputs;
     size_t inactiveCount = 0;
     for (size_t i = 0; i < m_inputs.size(); ++i) {
         MIDIInput* input = m_inputs[i];
-        if (input->isActive())
+        if (input->getState() != PortState::MIDIPortStateDisconnected)
             inputs.add(input->id(), input);
         else
             inactiveCount++;
     }
     if ((inputs.size() + inactiveCount) != m_inputs.size()) {
         // There is id duplication that violates the spec.
         inputs.clear();
     }
     return new MIDIInputMap(inputs);
 }
 
 MIDIOutputMap* MIDIAccess::outputs() const
 {
     HeapHashMap<String, Member<MIDIOutput>> outputs;
     size_t inactiveCount = 0;
     for (size_t i = 0; i < m_outputs.size(); ++i) {
         MIDIOutput* output = m_outputs[i];
-        if (output->isActive())
+        if (output->getState() != PortState::MIDIPortStateDisconnected)
             outputs.add(output->id(), output);
         else
             inactiveCount++;
     }
     if ((outputs.size() + inactiveCount) != m_outputs.size()) {
         // There is id duplication that violates the spec.
         outputs.clear();
     }
     return new MIDIOutputMap(outputs);
 }
 
-void MIDIAccess::didAddInputPort(const String& id, const String& manufacturer, const String& name, const String& version, bool isActive)
+void MIDIAccess::didAddInputPort(const String& id, const String& manufacturer, const String& name, const String& version, PortState state)
 {
     ASSERT(isMainThread());
-    MIDIInput* port = MIDIInput::create(this, id, manufacturer, name, version, isActive);
+    MIDIInput* port = MIDIInput::create(this, id, manufacturer, name, version, state);
     m_inputs.append(port);
     dispatchEvent(MIDIConnectionEvent::create(port));
 }
 
-void MIDIAccess::didAddOutputPort(const String& id, const String& manufacturer, const String& name, const String& version, bool isActive)
+void MIDIAccess::didAddOutputPort(const String& id, const String& manufacturer, const String& name, const String& version, PortState state)
 {
     ASSERT(isMainThread());
     unsigned portIndex = m_outputs.size();
-    MIDIOutput* port = MIDIOutput::create(this, portIndex, id, manufacturer, name, version, isActive);
+    MIDIOutput* port = MIDIOutput::create(this, portIndex, id, manufacturer, name, version, state);
     m_outputs.append(port);
     dispatchEvent(MIDIConnectionEvent::create(port));
 }
 
-void MIDIAccess::didSetInputPortState(unsigned portIndex, bool isActive)
+void MIDIAccess::didSetInputPortState(unsigned portIndex, PortState state)
 {
     ASSERT(isMainThread());
     if (portIndex >= m_inputs.size())
         return;
 
-    m_inputs[portIndex]->setActiveState(isActive);
+    m_inputs[portIndex]->setState(state);
     dispatchEvent(MIDIConnectionEvent::create(m_inputs[portIndex]));
 }
 
-void MIDIAccess::didSetOutputPortState(unsigned portIndex, bool isActive)
+void MIDIAccess::didSetOutputPortState(unsigned portIndex, PortState state)
 {
     ASSERT(isMainThread());
     if (portIndex >= m_outputs.size())
         return;
 
-    m_outputs[portIndex]->setActiveState(isActive);
+    m_outputs[portIndex]->setState(state);
     dispatchEvent(MIDIConnectionEvent::create(m_outputs[portIndex]));
 }
 
 void MIDIAccess::didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStamp)
 {
     ASSERT(isMainThread());
     if (portIndex >= m_inputs.size())
         return;
 
     // Convert from time in seconds which is based on the time coordinate system of monotonicallyIncreasingTime()
@@ skipping 36 matching lines @@
 
 DEFINE_TRACE(MIDIAccess)
 {
     visitor->trace(m_inputs);
     visitor->trace(m_outputs);
     RefCountedGarbageCollectedEventTargetWithInlineData<MIDIAccess>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink