Web MIDI: move device state adjustment code from content to Blink

third_party/WebKit/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 27 matching lines @@
 #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"
 #include <memory>
 
 namespace blink {
 
+namespace {
+
 using midi::mojom::PortState;
 
+// Since "open" status is separately managed per MIDIAccess instance, we do not
+// expose service level PortState directly.
+PortState ToDeviceState(PortState state) {
+  if (state == PortState::OPENED)
+    return PortState::CONNECTED;
+  return state;
+}
+
+}  // namespace
+
 MIDIAccess::MIDIAccess(
     std::unique_ptr<MIDIAccessor> accessor,
     bool sysexEnabled,
     const Vector<MIDIAccessInitializer::PortDescriptor>& ports,
     ExecutionContext* executionContext)
     : ActiveScriptWrappable(this),
       ActiveDOMObject(executionContext),
       m_accessor(std::move(accessor)),
       m_sysexEnabled(sysexEnabled),
       m_hasPendingActivity(false) {
@@ skipping 65 matching lines @@
   }
   return new MIDIOutputMap(outputs);
 }
 
 void MIDIAccess::didAddInputPort(const String& id,
                                  const String& manufacturer,
                                  const String& name,
                                  const String& version,
                                  PortState state) {
   DCHECK(isMainThread());
-  MIDIInput* port =
-      MIDIInput::create(this, id, manufacturer, name, version, state);
+  MIDIInput* port = MIDIInput::create(this, id, manufacturer, name, version,
+                                      ToDeviceState(state));
   m_inputs.append(port);
   dispatchEvent(MIDIConnectionEvent::create(port));
 }
 
 void MIDIAccess::didAddOutputPort(const String& id,
                                   const String& manufacturer,
                                   const String& name,
                                   const String& version,
                                   PortState state) {
   DCHECK(isMainThread());
   unsigned portIndex = m_outputs.size();
   MIDIOutput* port = MIDIOutput::create(this, portIndex, id, manufacturer, name,
-                                        version, state);
+                                        version, ToDeviceState(state));
   m_outputs.append(port);
   dispatchEvent(MIDIConnectionEvent::create(port));
 }
 
 void MIDIAccess::didSetInputPortState(unsigned portIndex, PortState state) {
   DCHECK(isMainThread());
   if (portIndex >= m_inputs.size())
     return;
 
-  m_inputs[portIndex]->setState(state);
+  PortState deviceState = ToDeviceState(state);
+  if (m_inputs[portIndex]->getState() != deviceState)
+    m_inputs[portIndex]->setState(deviceState);
 }
 
 void MIDIAccess::didSetOutputPortState(unsigned portIndex, PortState state) {
   DCHECK(isMainThread());
   if (portIndex >= m_outputs.size())
     return;
 
-  m_outputs[portIndex]->setState(state);
+  PortState deviceState = ToDeviceState(state);
+  if (m_outputs[portIndex]->getState() != deviceState)
+    m_outputs[portIndex]->setState(deviceState);
 }
 
 void MIDIAccess::didReceiveMIDIData(unsigned portIndex,
                                     const unsigned char* data,
                                     size_t length,
                                     double timeStamp) {
   DCHECK(isMainThread());
   if (portIndex >= m_inputs.size())
     return;
 
@@ skipping 46 matching lines @@
 }
 
 DEFINE_TRACE(MIDIAccess) {
   visitor->trace(m_inputs);
   visitor->trace(m_outputs);
   EventTargetWithInlineData::trace(visitor);
   ActiveDOMObject::trace(visitor);
 }
 
 }  // namespace blink