summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/browser/media/midi_host.cc4
-rw-r--r--content/browser/media/midi_host.h2
-rw-r--r--content/common/media/midi_messages.h8
-rw-r--r--content/renderer/media/midi_message_filter.cc21
-rw-r--r--content/renderer/media/midi_message_filter.h8
5 files changed, 21 insertions, 22 deletions
diff --git a/content/browser/media/midi_host.cc b/content/browser/media/midi_host.cc
index d610025..c26a719 100644
--- a/content/browser/media/midi_host.cc
+++ b/content/browser/media/midi_host.cc
@@ -130,9 +130,9 @@ void MidiHost::OnEndSession() {
midi_manager_->EndSession(this);
}
-void MidiHost::CompleteStartSession(media::midi::MidiResult result) {
+void MidiHost::CompleteStartSession(media::midi::Result result) {
DCHECK(is_session_requested_);
- if (result == media::midi::MIDI_OK) {
+ if (result == media::midi::Result::OK) {
// ChildSecurityPolicy is set just before OnStartSession by
// MidiDispatcherHost. So we can safely cache the policy.
has_sys_ex_permission_ = ChildProcessSecurityPolicyImpl::GetInstance()->
diff --git a/content/browser/media/midi_host.h b/content/browser/media/midi_host.h
index 7a47775e..c6ff3ea 100644
--- a/content/browser/media/midi_host.h
+++ b/content/browser/media/midi_host.h
@@ -38,7 +38,7 @@ class CONTENT_EXPORT MidiHost : public BrowserMessageFilter,
bool OnMessageReceived(const IPC::Message& message) override;
// MidiManagerClient implementation.
- void CompleteStartSession(media::midi::MidiResult result) override;
+ void CompleteStartSession(media::midi::Result result) override;
void AddInputPort(const media::midi::MidiPortInfo& info) override;
void AddOutputPort(const media::midi::MidiPortInfo& info) override;
void SetInputPortState(uint32 port,
diff --git a/content/common/media/midi_messages.h b/content/common/media/midi_messages.h
index 67500f6..14ac45d 100644
--- a/content/common/media/midi_messages.h
+++ b/content/common/media/midi_messages.h
@@ -10,7 +10,7 @@
#include "ipc/ipc_message_macros.h"
#include "ipc/param_traits_macros.h"
#include "media/midi/midi_port_info.h"
-#include "media/midi/midi_result.h"
+#include "media/midi/result.h"
#include "url/gurl.h"
#undef IPC_MESSAGE_EXPORT
@@ -28,8 +28,7 @@ IPC_STRUCT_TRAITS_BEGIN(media::midi::MidiPortInfo)
IPC_STRUCT_TRAITS_MEMBER(state)
IPC_STRUCT_TRAITS_END()
-IPC_ENUM_TRAITS_MAX_VALUE(media::midi::MidiResult,
- media::midi::MIDI_RESULT_LAST)
+IPC_ENUM_TRAITS_MAX_VALUE(media::midi::Result, media::midi::Result::MAX)
// Messages for IPC between MidiMessageFilter and MidiHost.
@@ -59,8 +58,7 @@ IPC_MESSAGE_CONTROL2(MidiMsg_SetOutputPortState,
uint32 /* port */,
media::midi::MidiPortState /* state */)
-IPC_MESSAGE_CONTROL1(MidiMsg_SessionStarted,
- media::midi::MidiResult /* result */)
+IPC_MESSAGE_CONTROL1(MidiMsg_SessionStarted, media::midi::Result /* result */)
IPC_MESSAGE_CONTROL3(MidiMsg_DataReceived,
uint32 /* port */,
diff --git a/content/renderer/media/midi_message_filter.cc b/content/renderer/media/midi_message_filter.cc
index ceb4f08..82bdc70 100644
--- a/content/renderer/media/midi_message_filter.cc
+++ b/content/renderer/media/midi_message_filter.cc
@@ -29,7 +29,7 @@ MidiMessageFilter::MidiMessageFilter(
: sender_(nullptr),
io_task_runner_(io_task_runner),
main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
- session_result_(media::midi::MIDI_NOT_INITIALIZED),
+ session_result_(media::midi::Result::NOT_INITIALIZED),
unacknowledged_bytes_sent_(0u) {
}
@@ -39,7 +39,7 @@ void MidiMessageFilter::AddClient(blink::WebMIDIAccessorClient* client) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
TRACE_EVENT0("midi", "MidiMessageFilter::AddClient");
clients_waiting_session_queue_.push_back(client);
- if (session_result_ != media::midi::MIDI_NOT_INITIALIZED) {
+ if (session_result_ != media::midi::Result::NOT_INITIALIZED) {
HandleClientAdded(session_result_);
} else if (clients_waiting_session_queue_.size() == 1u) {
io_task_runner_->PostTask(
@@ -57,7 +57,7 @@ void MidiMessageFilter::RemoveClient(blink::WebMIDIAccessorClient* client) {
if (it != clients_waiting_session_queue_.end())
clients_waiting_session_queue_.erase(it);
if (clients_.empty() && clients_waiting_session_queue_.empty()) {
- session_result_ = media::midi::MIDI_NOT_INITIALIZED;
+ session_result_ = media::midi::Result::NOT_INITIALIZED;
inputs_.clear();
outputs_.clear();
io_task_runner_->PostTask(
@@ -143,7 +143,7 @@ void MidiMessageFilter::OnChannelClosing() {
sender_ = nullptr;
}
-void MidiMessageFilter::OnSessionStarted(media::midi::MidiResult result) {
+void MidiMessageFilter::OnSessionStarted(media::midi::Result result) {
TRACE_EVENT0("midi", "MidiMessageFilter::OnSessionStarted");
DCHECK(io_task_runner_->BelongsToCurrentThread());
// Handle on the main JS thread.
@@ -200,19 +200,19 @@ void MidiMessageFilter::OnAcknowledgeSentData(size_t bytes_sent) {
this, bytes_sent));
}
-void MidiMessageFilter::HandleClientAdded(media::midi::MidiResult result) {
+void MidiMessageFilter::HandleClientAdded(media::midi::Result result) {
TRACE_EVENT0("midi", "MidiMessageFilter::HandleClientAdded");
DCHECK(main_task_runner_->BelongsToCurrentThread());
session_result_ = result;
std::string error;
std::string message;
switch (result) {
- case media::midi::MIDI_OK:
+ case media::midi::Result::OK:
break;
- case media::midi::MIDI_NOT_SUPPORTED:
+ case media::midi::Result::NOT_SUPPORTED:
error = "NotSupportedError";
break;
- case media::midi::MIDI_INITIALIZATION_ERROR:
+ case media::midi::Result::INITIALIZATION_ERROR:
error = "InvalidStateError";
message = "Platform dependent initialization failed.";
break;
@@ -230,7 +230,7 @@ void MidiMessageFilter::HandleClientAdded(media::midi::MidiResult result) {
while (!clients_waiting_session_queue_.empty()) {
auto client = clients_waiting_session_queue_.back();
clients_waiting_session_queue_.pop_back();
- if (result == media::midi::MIDI_OK) {
+ if (result == media::midi::Result::OK) {
// Add the client's input and output ports.
for (const auto& info : inputs_) {
client->didAddInputPort(
@@ -250,7 +250,8 @@ void MidiMessageFilter::HandleClientAdded(media::midi::MidiResult result) {
ToBlinkState(info.state));
}
}
- client->didStartSession(result == media::midi::MIDI_OK, error16, message16);
+ client->didStartSession(result == media::midi::Result::OK, error16,
+ message16);
clients_.insert(client);
}
}
diff --git a/content/renderer/media/midi_message_filter.h b/content/renderer/media/midi_message_filter.h
index 26f12b9..77cbb73 100644
--- a/content/renderer/media/midi_message_filter.h
+++ b/content/renderer/media/midi_message_filter.h
@@ -12,7 +12,7 @@
#include "content/common/content_export.h"
#include "ipc/message_filter.h"
#include "media/midi/midi_port_info.h"
-#include "media/midi/midi_result.h"
+#include "media/midi/result.h"
#include "third_party/WebKit/public/platform/WebMIDIAccessorClient.h"
namespace base {
@@ -75,7 +75,7 @@ class CONTENT_EXPORT MidiMessageFilter : public IPC::MessageFilter {
// Called when the browser process has approved (or denied) access to
// MIDI hardware.
- void OnSessionStarted(media::midi::MidiResult result);
+ void OnSessionStarted(media::midi::Result result);
// These functions are called in 2 cases:
// (1) Just before calling |OnSessionStarted|, to notify the recipient about
@@ -103,7 +103,7 @@ class CONTENT_EXPORT MidiMessageFilter : public IPC::MessageFilter {
void OnAcknowledgeSentData(size_t bytes_sent);
// Following methods, Handle*, run on |main_task_runner_|.
- void HandleClientAdded(media::midi::MidiResult result);
+ void HandleClientAdded(media::midi::Result result);
void HandleAddInputPort(media::midi::MidiPortInfo info);
void HandleAddOutputPort(media::midi::MidiPortInfo info);
@@ -142,7 +142,7 @@ class CONTENT_EXPORT MidiMessageFilter : public IPC::MessageFilter {
ClientsQueue clients_waiting_session_queue_;
// Represents a result on starting a session. Can be accessed only on
- media::midi::MidiResult session_result_;
+ media::midi::Result session_result_;
// Holds MidiPortInfoList for input ports and output ports.
media::midi::MidiPortInfoList inputs_;
generated by cgit v1.1 at 2025-02-09 17:03:37 +0000