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

Unified Diff: content/renderer/media/midi_message_filter.cc

Issue 2438043003: Web MIDI: move device state adjustment code from content to Blink (Closed)
Patch Set: 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: content/renderer/media/midi_message_filter.cc
diff --git a/content/renderer/media/midi_message_filter.cc b/content/renderer/media/midi_message_filter.cc
index 7ac4f05530f0802e5a7b20d9821c0b019f27ec66..9adeca7763dde8470bbd8084439bc9eba88a783c 100644
--- a/content/renderer/media/midi_message_filter.cc
+++ b/content/renderer/media/midi_message_filter.cc
@@ -214,16 +214,14 @@ void MidiMessageFilter::HandleClientAdded(Result result) {
client->didAddInputPort(base::UTF8ToUTF16(info.id),
base::UTF8ToUTF16(info.manufacturer),
base::UTF8ToUTF16(info.name),
- base::UTF8ToUTF16(info.version),
- ToBlinkState(info.state));
+ base::UTF8ToUTF16(info.version), info.state);
}
for (const auto& info : outputs_) {
client->didAddOutputPort(base::UTF8ToUTF16(info.id),
base::UTF8ToUTF16(info.manufacturer),
base::UTF8ToUTF16(info.name),
- base::UTF8ToUTF16(info.version),
- ToBlinkState(info.state));
+ base::UTF8ToUTF16(info.version), info.state);
}
}
client->didStartSession(result);
@@ -238,9 +236,8 @@ void MidiMessageFilter::HandleAddInputPort(midi::MidiPortInfo info) {
const base::string16 manufacturer = base::UTF8ToUTF16(info.manufacturer);
const base::string16 name = base::UTF8ToUTF16(info.name);
const base::string16 version = base::UTF8ToUTF16(info.version);
- const PortState state = ToBlinkState(info.state);
for (auto* client : clients_)
- client->didAddInputPort(id, manufacturer, name, version, state);
+ client->didAddInputPort(id, manufacturer, name, version, info.state);
}
void MidiMessageFilter::HandleAddOutputPort(midi::MidiPortInfo info) {
@@ -250,9 +247,8 @@ void MidiMessageFilter::HandleAddOutputPort(midi::MidiPortInfo info) {
const base::string16 manufacturer = base::UTF8ToUTF16(info.manufacturer);
const base::string16 name = base::UTF8ToUTF16(info.name);
const base::string16 version = base::UTF8ToUTF16(info.version);
- const PortState state = ToBlinkState(info.state);
for (auto* client : clients_)
- client->didAddOutputPort(id, manufacturer, name, version, state);
+ client->didAddOutputPort(id, manufacturer, name, version, info.state);
}
void MidiMessageFilter::HandleDataReceived(uint32_t port,
@@ -276,17 +272,21 @@ void MidiMessageFilter::HandleAckknowledgeSentData(size_t bytes_sent) {
void MidiMessageFilter::HandleSetInputPortState(uint32_t port,
PortState state) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
+ if (inputs_[port].state == state)
+ return;
inputs_[port].state = state;
for (auto* client : clients_)
- client->didSetInputPortState(port, ToBlinkState(state));
+ client->didSetInputPortState(port, state);
}
void MidiMessageFilter::HandleSetOutputPortState(uint32_t port,
PortState state) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
+ if (outputs_[port].state == state)
+ return;
outputs_[port].state = state;
for (auto* client : clients_)
- client->didSetOutputPortState(port, ToBlinkState(state));
+ client->didSetOutputPortState(port, state);
}
} // namespace content
« no previous file with comments | « content/renderer/media/midi_message_filter.h ('k') | content/renderer/media/midi_message_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698