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

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 {
 
-using PortState = MIDIAccessor::MIDIPortState;
+using PortState = midi::mojom::PortState;

[yhirano, 2016/10/21 02:21:50]

using midi::mojom::PortState;

[Takashi Toyoshima, 2016/10/21 05:46:56]

Oops, same error :/
Thank you for catching this.

 
 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),
@@ skipping 31 matching lines @@
 bool MIDIAccess::hasPendingActivity() const {
   return m_hasPendingActivity && getExecutionContext() &&
          !getExecutionContext()->activeDOMObjectsAreStopped();
 }
 
 MIDIInputMap* MIDIAccess::inputs() const {
   HeapVector<Member<MIDIInput>> inputs;
   HashSet<String> ids;
   for (size_t i = 0; i < m_inputs.size(); ++i) {
     MIDIInput* input = m_inputs[i];
-    if (input->getState() != PortState::MIDIPortStateDisconnected) {
+    if (input->getState() != PortState::DISCONNECTED) {
       inputs.append(input);
       ids.add(input->id());
     }
   }
   if (inputs.size() != ids.size()) {
     // There is id duplication that violates the spec.
     inputs.clear();
   }
   return new MIDIInputMap(inputs);
 }
 
 MIDIOutputMap* MIDIAccess::outputs() const {
   HeapVector<Member<MIDIOutput>> outputs;
   HashSet<String> ids;
   for (size_t i = 0; i < m_outputs.size(); ++i) {
     MIDIOutput* output = m_outputs[i];
-    if (output->getState() != PortState::MIDIPortStateDisconnected) {
+    if (output->getState() != PortState::DISCONNECTED) {
       outputs.append(output);
       ids.add(output->id());
     }
   }
   if (outputs.size() != ids.size()) {
     // There is id duplication that violates the spec.
     outputs.clear();
   }
   return new MIDIOutputMap(outputs);
 }
@@ skipping 96 matching lines @@
 }
 
 DEFINE_TRACE(MIDIAccess) {
   visitor->trace(m_inputs);
   visitor->trace(m_outputs);
   EventTargetWithInlineData::trace(visitor);
   ActiveDOMObject::trace(visitor);
 }
 
 }  // namespace blink