Web MIDI: use midi_service.mojom for media::midi::PortState

content/renderer/media/midi_message_filter.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_MIDI_MESSAGE_FILTER_H_
 #define CONTENT_RENDERER_MEDIA_MIDI_MESSAGE_FILTER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 36 matching lines @@
   void SendMidiData(uint32_t port,
                     const uint8_t* data,
                     size_t length,
                     double timestamp);
 
   // IO task runner associated with this message filter.
   base::SingleThreadTaskRunner* io_task_runner() const {
     return io_task_runner_.get();
   }
 
-  static blink::WebMIDIAccessorClient::MIDIPortState ToBlinkState(
-      midi::MidiPortState state) {
+  static midi::mojom::PortState ToBlinkState(midi::mojom::PortState state) {
     // "open" status is separately managed by blink per MIDIAccess instance.
-    if (state == midi::MIDI_PORT_OPENED)
-      state = midi::MIDI_PORT_CONNECTED;
-    return static_cast<blink::WebMIDIAccessorClient::MIDIPortState>(state);
+    // TODO(toyoshim): Pass through the state as is, and have a logic to convert
+    // this state to JavaScript exposing state in Blink side.
+    if (state == midi::mojom::PortState::OPENED)
+      return midi::mojom::PortState::CONNECTED;
+    return state;
   }
 
  protected:
   ~MidiMessageFilter() override;
 
  private:
   void StartSessionOnIOThread();
 
   void SendMidiDataOnIOThread(uint32_t port,
                               const std::vector<uint8_t>& data,
@@ skipping 18 matching lines @@
   //  (1) Just before calling |OnSessionStarted|, to notify the recipient about
   //      existing ports.
   //  (2) To notify the recipient that a new device was connected and that new
   //      ports have been created.
   void OnAddInputPort(midi::MidiPortInfo info);
   void OnAddOutputPort(midi::MidiPortInfo info);
 
   // These functions are called to notify the recipient that a device that is
   // notified via OnAddInputPort() or OnAddOutputPort() gets disconnected, or
   // connected again.
-  void OnSetInputPortState(uint32_t port, midi::MidiPortState state);
-  void OnSetOutputPortState(uint32_t port, midi::MidiPortState state);
+  void OnSetInputPortState(uint32_t port, midi::mojom::PortState state);
+  void OnSetOutputPortState(uint32_t port, midi::mojom::PortState state);
 
   // Called when the browser process has sent MIDI data containing one or
   // more messages.
   void OnDataReceived(uint32_t port,
                       const std::vector<uint8_t>& data,
                       double timestamp);
 
   // From time-to-time, the browser incrementally informs us of how many bytes
   // it has successfully sent. This is part of our throttling process to avoid
   // sending too much data before knowing how much has already been sent.
   void OnAcknowledgeSentData(size_t bytes_sent);
 
   // Following methods, Handle*, run on |main_task_runner_|.
   void HandleClientAdded(midi::mojom::Result result);
 
   void HandleAddInputPort(midi::MidiPortInfo info);
   void HandleAddOutputPort(midi::MidiPortInfo info);
-  void HandleSetInputPortState(uint32_t port, midi::MidiPortState state);
-  void HandleSetOutputPortState(uint32_t port,
-                                midi::MidiPortState state);
+  void HandleSetInputPortState(uint32_t port, midi::mojom::PortState state);
+  void HandleSetOutputPortState(uint32_t port, midi::mojom::PortState state);
 
   void HandleDataReceived(uint32_t port,
                           const std::vector<uint8_t>& data,
                           double timestamp);
 
   void HandleAckknowledgeSentData(size_t bytes_sent);
 
   // IPC sender for Send(); must only be accessed on |io_task_runner_|.
   IPC::Sender* sender_;
 
@@ skipping 27 matching lines @@
   midi::MidiPortInfoList outputs_;
 
   size_t unacknowledged_bytes_sent_;
 
   DISALLOW_COPY_AND_ASSIGN(MidiMessageFilter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MIDI_MESSAGE_FILTER_H_