Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(812)

Unified Diff: third_party/WebKit/Source/modules/webmidi/MIDIPort.h

Issue 2422163002: Web MIDI: use midi_service.mojom for media::midi::PortState (Closed)
Patch Set: gn --check fix Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/webmidi/MIDIPort.h
diff --git a/third_party/WebKit/Source/modules/webmidi/MIDIPort.h b/third_party/WebKit/Source/modules/webmidi/MIDIPort.h
index 60593688cd2ec835ba9680c3b492f58703104b06..2a5f0dc9b66e30b60eb37c7eb241a5317f56398a 100644
--- a/third_party/WebKit/Source/modules/webmidi/MIDIPort.h
+++ b/third_party/WebKit/Source/modules/webmidi/MIDIPort.h
@@ -35,6 +35,7 @@
#include "bindings/core/v8/ScriptPromise.h"
#include "core/dom/ActiveDOMObject.h"
#include "core/dom/ExceptionCode.h"
+#include "media/midi/midi_service.mojom-blink.h"
#include "modules/EventTargetModules.h"
#include "modules/webmidi/MIDIAccessor.h"
#include "platform/heap/Handle.h"
@@ -72,8 +73,8 @@ class MIDIPort : public EventTargetWithInlineData,
ScriptPromise close(ScriptState*);
MIDIAccess* midiAccess() const { return m_access; }
- MIDIAccessor::MIDIPortState getState() const { return m_state; }
- void setState(MIDIAccessor::MIDIPortState);
+ midi::mojom::PortState getState() const { return m_state; }
+ void setState(midi::mojom::PortState);
ConnectionState getConnection() const { return m_connection; }
DECLARE_VIRTUAL_TRACE();
@@ -101,7 +102,7 @@ class MIDIPort : public EventTargetWithInlineData,
const String& name,
TypeCode,
const String& version,
- MIDIAccessor::MIDIPortState);
+ midi::mojom::PortState);
void open();
@@ -109,7 +110,7 @@ class MIDIPort : public EventTargetWithInlineData,
ScriptPromise accept(ScriptState*);
ScriptPromise reject(ScriptState*, ExceptionCode, const String& message);
- void setStates(MIDIAccessor::MIDIPortState, ConnectionState);
+ void setStates(midi::mojom::PortState, ConnectionState);
String m_id;
String m_manufacturer;
@@ -117,7 +118,7 @@ class MIDIPort : public EventTargetWithInlineData,
TypeCode m_type;
String m_version;
Member<MIDIAccess> m_access;
- MIDIAccessor::MIDIPortState m_state;
+ midi::mojom::PortState m_state;
ConnectionState m_connection;
};
« no previous file with comments | « third_party/WebKit/Source/modules/webmidi/MIDIOutput.cpp ('k') | third_party/WebKit/Source/modules/webmidi/MIDIPort.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698