diff options
Diffstat (limited to 'content')
27 files changed, 203 insertions, 201 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 0e946cf..f1a801b 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -468,8 +468,8 @@ void BrowserMainLoop::MainMessageLoopStart() { MediaInternals::GetInstance())); } { - TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager") - midi_manager_.reset(media::MIDIManager::Create()); + TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MidiManager") + midi_manager_.reset(media::MidiManager::Create()); } { TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h index 445d990..5c16af4 100644 --- a/content/browser/browser_main_loop.h +++ b/content/browser/browser_main_loop.h @@ -27,7 +27,7 @@ class TraceEventSystemStatsMonitor; namespace media { class AudioManager; -class MIDIManager; +class MidiManager; class UserInputMonitor; } // namespace media @@ -96,7 +96,7 @@ class CONTENT_EXPORT BrowserMainLoop { media::UserInputMonitor* user_input_monitor() const { return user_input_monitor_.get(); } - media::MIDIManager* midi_manager() const { return midi_manager_.get(); } + media::MidiManager* midi_manager() const { return midi_manager_.get(); } base::Thread* indexed_db_thread() const { return indexed_db_thread_.get(); } bool is_tracing_startup() const { return is_tracing_startup_; } @@ -140,7 +140,7 @@ class CONTENT_EXPORT BrowserMainLoop { // user_input_monitor_ has to outlive audio_manager_, so declared first. scoped_ptr<media::UserInputMonitor> user_input_monitor_; scoped_ptr<media::AudioManager> audio_manager_; - scoped_ptr<media::MIDIManager> midi_manager_; + scoped_ptr<media::MidiManager> midi_manager_; scoped_ptr<AudioMirroringManager> audio_mirroring_manager_; scoped_ptr<MediaStreamManager> media_stream_manager_; // Per-process listener for online state changes. diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc index 0b67427..b115217 100644 --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc @@ -163,7 +163,7 @@ class ChildProcessSecurityPolicyImpl::SecurityState { can_read_raw_cookies_ = false; } - void GrantPermissionForMIDISysEx() { + void GrantPermissionForMidiSysEx() { can_send_midi_sysex_ = true; } @@ -514,14 +514,14 @@ void ChildProcessSecurityPolicyImpl::GrantDeleteFromFileSystem( GrantPermissionsForFileSystem(child_id, filesystem_id, DELETE_FILE_GRANT); } -void ChildProcessSecurityPolicyImpl::GrantSendMIDISysExMessage(int child_id) { +void ChildProcessSecurityPolicyImpl::GrantSendMidiSysExMessage(int child_id) { base::AutoLock lock(lock_); SecurityStateMap::iterator state = security_state_.find(child_id); if (state == security_state_.end()) return; - state->second->GrantPermissionForMIDISysEx(); + state->second->GrantPermissionForMidiSysEx(); } void ChildProcessSecurityPolicyImpl::GrantScheme(int child_id, @@ -871,7 +871,7 @@ void ChildProcessSecurityPolicyImpl::RegisterFileSystemPermissionPolicy( file_system_policy_map_[type] = policy; } -bool ChildProcessSecurityPolicyImpl::CanSendMIDISysExMessage(int child_id) { +bool ChildProcessSecurityPolicyImpl::CanSendMidiSysExMessage(int child_id) { base::AutoLock lock(lock_); SecurityStateMap::iterator state = security_state_.find(child_id); diff --git a/content/browser/child_process_security_policy_impl.h b/content/browser/child_process_security_policy_impl.h index 93480ad..db640d8 100644 --- a/content/browser/child_process_security_policy_impl.h +++ b/content/browser/child_process_security_policy_impl.h @@ -124,7 +124,7 @@ class CONTENT_EXPORT ChildProcessSecurityPolicyImpl void RevokeReadRawCookies(int child_id); // Grants permission to send system exclusive message to any MIDI devices. - void GrantSendMIDISysExMessage(int child_id); + void GrantSendMidiSysExMessage(int child_id); // Before servicing a child process's request for a URL, the browser should // call this method to determine whether the process has the capability to @@ -184,7 +184,7 @@ class CONTENT_EXPORT ChildProcessSecurityPolicyImpl int policy); // Returns true if sending system exclusive messages is allowed. - bool CanSendMIDISysExMessage(int child_id); + bool CanSendMidiSysExMessage(int child_id); private: friend class ChildProcessSecurityPolicyInProcessBrowserTest; diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc index e934f1d..70a392f 100644 --- a/content/browser/download/download_manager_impl_unittest.cc +++ b/content/browser/download/download_manager_impl_unittest.cc @@ -404,13 +404,13 @@ class MockBrowserContext : public BrowserContext { MOCK_METHOD2(GetMediaRequestContextForStoragePartition, net::URLRequestContextGetter*( const base::FilePath& partition_path, bool in_memory)); - MOCK_METHOD5(RequestMIDISysExPermission, + MOCK_METHOD5(RequestMidiSysExPermission, void(int render_process_id, int render_view_id, int bridge_id, const GURL& requesting_frame, - const MIDISysExPermissionCallback& callback)); - MOCK_METHOD4(CancelMIDISysExPermissionRequest, + const MidiSysExPermissionCallback& callback)); + MOCK_METHOD4(CancelMidiSysExPermissionRequest, void(int render_process_id, int render_view_id, int bridge_id, diff --git a/content/browser/renderer_host/media/midi_dispatcher_host.cc b/content/browser/renderer_host/media/midi_dispatcher_host.cc index 2181dcc..73b69ac 100644 --- a/content/browser/renderer_host/media/midi_dispatcher_host.cc +++ b/content/browser/renderer_host/media/midi_dispatcher_host.cc @@ -14,66 +14,66 @@ namespace content { -MIDIDispatcherHost::MIDIDispatcherHost(int render_process_id, +MidiDispatcherHost::MidiDispatcherHost(int render_process_id, BrowserContext* browser_context) : render_process_id_(render_process_id), browser_context_(browser_context) { } -MIDIDispatcherHost::~MIDIDispatcherHost() { +MidiDispatcherHost::~MidiDispatcherHost() { } -bool MIDIDispatcherHost::OnMessageReceived(const IPC::Message& message, +bool MidiDispatcherHost::OnMessageReceived(const IPC::Message& message, bool* message_was_ok) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(MIDIDispatcherHost, message, *message_was_ok) - IPC_MESSAGE_HANDLER(MIDIHostMsg_RequestSysExPermission, + IPC_BEGIN_MESSAGE_MAP_EX(MidiDispatcherHost, message, *message_was_ok) + IPC_MESSAGE_HANDLER(MidiHostMsg_RequestSysExPermission, OnRequestSysExPermission) - IPC_MESSAGE_HANDLER(MIDIHostMsg_CancelSysExPermissionRequest, + IPC_MESSAGE_HANDLER(MidiHostMsg_CancelSysExPermissionRequest, OnCancelSysExPermissionRequest) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP_EX() return handled; } -void MIDIDispatcherHost::OverrideThreadForMessage( +void MidiDispatcherHost::OverrideThreadForMessage( const IPC::Message& message, BrowserThread::ID* thread) { - if (IPC_MESSAGE_CLASS(message) == MIDIMsgStart) + if (IPC_MESSAGE_CLASS(message) == MidiMsgStart) *thread = BrowserThread::UI; } -void MIDIDispatcherHost::OnRequestSysExPermission(int render_view_id, +void MidiDispatcherHost::OnRequestSysExPermission(int render_view_id, int bridge_id, const GURL& origin) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - browser_context_->RequestMIDISysExPermission( + browser_context_->RequestMidiSysExPermission( render_process_id_, render_view_id, bridge_id, origin, - base::Bind(&MIDIDispatcherHost::WasSysExPermissionGranted, + base::Bind(&MidiDispatcherHost::WasSysExPermissionGranted, base::Unretained(this), render_view_id, bridge_id)); } -void MIDIDispatcherHost::OnCancelSysExPermissionRequest( +void MidiDispatcherHost::OnCancelSysExPermissionRequest( int render_view_id, int bridge_id, const GURL& requesting_frame) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DVLOG(1) << __FUNCTION__ << " " << render_process_id_ << ":" << render_view_id << ":" << bridge_id; - browser_context_->CancelMIDISysExPermissionRequest( + browser_context_->CancelMidiSysExPermissionRequest( render_process_id_, render_view_id, bridge_id, requesting_frame); } -void MIDIDispatcherHost::WasSysExPermissionGranted(int render_view_id, +void MidiDispatcherHost::WasSysExPermissionGranted(int render_view_id, int bridge_id, bool success) { - ChildProcessSecurityPolicyImpl::GetInstance()->GrantSendMIDISysExMessage( + ChildProcessSecurityPolicyImpl::GetInstance()->GrantSendMidiSysExMessage( render_process_id_); - Send(new MIDIMsg_SysExPermissionApproved(render_view_id, bridge_id, success)); + Send(new MidiMsg_SysExPermissionApproved(render_view_id, bridge_id, success)); } } // namespace content diff --git a/content/browser/renderer_host/media/midi_dispatcher_host.h b/content/browser/renderer_host/media/midi_dispatcher_host.h index 068f719..8bc1bb0 100644 --- a/content/browser/renderer_host/media/midi_dispatcher_host.h +++ b/content/browser/renderer_host/media/midi_dispatcher_host.h @@ -13,12 +13,12 @@ namespace content { class BrowserContext; -// MIDIDispatcherHost handles permissions for using system exclusive messages. +// MidiDispatcherHost handles permissions for using system exclusive messages. // It works as BrowserMessageFilter to handle IPC messages between -// MIDIDispatcher running as a RenderViewObserver. -class MIDIDispatcherHost : public BrowserMessageFilter { +// MidiDispatcher running as a RenderViewObserver. +class MidiDispatcherHost : public BrowserMessageFilter { public: - MIDIDispatcherHost(int render_process_id, BrowserContext* browser_context); + MidiDispatcherHost(int render_process_id, BrowserContext* browser_context); // BrowserMessageFilter implementation. virtual bool OnMessageReceived(const IPC::Message& message, @@ -27,7 +27,7 @@ class MIDIDispatcherHost : public BrowserMessageFilter { const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE; protected: - virtual ~MIDIDispatcherHost(); + virtual ~MidiDispatcherHost(); private: void OnRequestSysExPermission(int render_view_id, @@ -43,7 +43,7 @@ class MIDIDispatcherHost : public BrowserMessageFilter { int render_process_id_; BrowserContext* browser_context_; - DISALLOW_COPY_AND_ASSIGN(MIDIDispatcherHost); + DISALLOW_COPY_AND_ASSIGN(MidiDispatcherHost); }; } // namespace content diff --git a/content/browser/renderer_host/media/midi_host.cc b/content/browser/renderer_host/media/midi_host.cc index 765ebc1..1d50a46 100644 --- a/content/browser/renderer_host/media/midi_host.cc +++ b/content/browser/renderer_host/media/midi_host.cc @@ -19,8 +19,8 @@ #include "media/midi/midi_message_queue.h" #include "media/midi/midi_message_util.h" -using media::MIDIManager; -using media::MIDIPortInfoList; +using media::MidiManager; +using media::MidiPortInfoList; namespace content { namespace { @@ -48,7 +48,7 @@ bool IsSystemRealTimeMessage(uint8 data) { using media::kSysExByte; using media::kEndOfSysExByte; -MIDIHost::MIDIHost(int renderer_process_id, media::MIDIManager* midi_manager) +MidiHost::MidiHost(int renderer_process_id, media::MidiManager* midi_manager) : renderer_process_id_(renderer_process_id), has_sys_ex_permission_(false), midi_manager_(midi_manager), @@ -56,32 +56,31 @@ MIDIHost::MIDIHost(int renderer_process_id, media::MIDIManager* midi_manager) bytes_sent_since_last_acknowledgement_(0) { } -MIDIHost::~MIDIHost() { +MidiHost::~MidiHost() { if (midi_manager_) midi_manager_->EndSession(this); } -void MIDIHost::OnDestruct() const { +void MidiHost::OnDestruct() const { BrowserThread::DeleteOnIOThread::Destruct(this); } -/////////////////////////////////////////////////////////////////////////////// // IPC Messages handler -bool MIDIHost::OnMessageReceived(const IPC::Message& message, +bool MidiHost::OnMessageReceived(const IPC::Message& message, bool* message_was_ok) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(MIDIHost, message, *message_was_ok) - IPC_MESSAGE_HANDLER(MIDIHostMsg_StartSession, OnStartSession) - IPC_MESSAGE_HANDLER(MIDIHostMsg_SendData, OnSendData) + IPC_BEGIN_MESSAGE_MAP_EX(MidiHost, message, *message_was_ok) + IPC_MESSAGE_HANDLER(MidiHostMsg_StartSession, OnStartSession) + IPC_MESSAGE_HANDLER(MidiHostMsg_SendData, OnSendData) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP_EX() return handled; } -void MIDIHost::OnStartSession(int client_id) { - MIDIPortInfoList input_ports; - MIDIPortInfoList output_ports; +void MidiHost::OnStartSession(int client_id) { + MidiPortInfoList input_ports; + MidiPortInfoList output_ports; // Initialize devices and register to receive MIDI data. bool success = false; @@ -93,20 +92,20 @@ void MIDIHost::OnStartSession(int client_id) { received_messages_queues_.clear(); received_messages_queues_.resize(input_ports.size()); // ChildSecurityPolicy is set just before OnStartSession by - // MIDIDispatcherHost. So we can safely cache the policy. + // MidiDispatcherHost. So we can safely cache the policy. has_sys_ex_permission_ = ChildProcessSecurityPolicyImpl::GetInstance()-> - CanSendMIDISysExMessage(renderer_process_id_); + CanSendMidiSysExMessage(renderer_process_id_); } } - Send(new MIDIMsg_SessionStarted( + Send(new MidiMsg_SessionStarted( client_id, success, input_ports, output_ports)); } -void MIDIHost::OnSendData(uint32 port, +void MidiHost::OnSendData(uint32 port, const std::vector<uint8>& data, double timestamp) { if (!midi_manager_) @@ -134,23 +133,23 @@ void MIDIHost::OnSendData(uint32 port, // after some future discussion in W3C. if (data.size() + sent_bytes_in_flight_ > kMaxInFlightBytes) return; - midi_manager_->DispatchSendMIDIData(this, port, data, timestamp); + midi_manager_->DispatchSendMidiData(this, port, data, timestamp); sent_bytes_in_flight_ += data.size(); } -void MIDIHost::ReceiveMIDIData( +void MidiHost::ReceiveMidiData( uint32 port, const uint8* data, size_t length, double timestamp) { - TRACE_EVENT0("midi", "MIDIHost::ReceiveMIDIData"); + TRACE_EVENT0("midi", "MidiHost::ReceiveMidiData"); if (received_messages_queues_.size() <= port) return; // Lazy initialization if (received_messages_queues_[port] == NULL) - received_messages_queues_[port] = new media::MIDIMessageQueue(true); + received_messages_queues_[port] = new media::MidiMessageQueue(true); received_messages_queues_[port]->Add(data, length); std::vector<uint8> message; @@ -166,11 +165,11 @@ void MIDIHost::ReceiveMIDIData( continue; // Send to the renderer. - Send(new MIDIMsg_DataReceived(port, message, timestamp)); + Send(new MidiMsg_DataReceived(port, message, timestamp)); } } -void MIDIHost::AccumulateMIDIBytesSent(size_t n) { +void MidiHost::AccumulateMidiBytesSent(size_t n) { { base::AutoLock auto_lock(in_flight_lock_); if (n <= sent_bytes_in_flight_) @@ -183,14 +182,14 @@ void MIDIHost::AccumulateMIDIBytesSent(size_t n) { if (bytes_sent_since_last_acknowledgement_ >= kAcknowledgementThresholdBytes) { - Send(new MIDIMsg_AcknowledgeSentData( + Send(new MidiMsg_AcknowledgeSentData( bytes_sent_since_last_acknowledgement_)); bytes_sent_since_last_acknowledgement_ = 0; } } // static -bool MIDIHost::IsValidWebMIDIData(const std::vector<uint8>& data) { +bool MidiHost::IsValidWebMIDIData(const std::vector<uint8>& data) { bool in_sysex = false; size_t waiting_data_length = 0; for (size_t i = 0; i < data.size(); ++i) { @@ -214,7 +213,7 @@ bool MIDIHost::IsValidWebMIDIData(const std::vector<uint8>& data) { in_sysex = true; continue; // Found SysEX } - waiting_data_length = media::GetMIDIMessageLength(current); + waiting_data_length = media::GetMidiMessageLength(current); if (waiting_data_length == 0) return false; // Error: |current| should have been a valid status byte. --waiting_data_length; // Found status byte diff --git a/content/browser/renderer_host/media/midi_host.h b/content/browser/renderer_host/media/midi_host.h index 153863f..d7229f5 100644 --- a/content/browser/renderer_host/media/midi_host.h +++ b/content/browser/renderer_host/media/midi_host.h @@ -17,30 +17,30 @@ #include "media/midi/midi_manager.h" namespace media { -class MIDIManager; -class MIDIMessageQueue; +class MidiManager; +class MidiMessageQueue; } namespace content { -class CONTENT_EXPORT MIDIHost +class CONTENT_EXPORT MidiHost : public BrowserMessageFilter, - public media::MIDIManagerClient { + public media::MidiManagerClient { public: // Called from UI thread from the owner of this object. - MIDIHost(int renderer_process_id, media::MIDIManager* midi_manager); + MidiHost(int renderer_process_id, media::MidiManager* midi_manager); // BrowserMessageFilter implementation. virtual void OnDestruct() const OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message, bool* message_was_ok) OVERRIDE; - // MIDIManagerClient implementation. - virtual void ReceiveMIDIData(uint32 port, + // MidiManagerClient implementation. + virtual void ReceiveMidiData(uint32 port, const uint8* data, size_t length, double timestamp) OVERRIDE; - virtual void AccumulateMIDIBytesSent(size_t n) OVERRIDE; + virtual void AccumulateMidiBytesSent(size_t n) OVERRIDE; // Start session to access MIDI hardware. void OnStartSession(int client_id); @@ -51,13 +51,13 @@ class CONTENT_EXPORT MIDIHost double timestamp); private: - FRIEND_TEST_ALL_PREFIXES(MIDIHostTest, IsValidWebMIDIData); - friend class base::DeleteHelper<MIDIHost>; + FRIEND_TEST_ALL_PREFIXES(MidiHostTest, IsValidWebMIDIData); + friend class base::DeleteHelper<MidiHost>; friend class BrowserThread; - virtual ~MIDIHost(); + virtual ~MidiHost(); - // Returns true if |data| fulfills the requirements of MIDIOutput.send API + // Returns true if |data| fulfills the requirements of MidiOutput.send API // defined in the WebMIDI spec. // - |data| must be any number of complete MIDI messages (data abbreviation // called "running status" is disallowed). @@ -75,10 +75,10 @@ class CONTENT_EXPORT MIDIHost // does not support MIDI. If not supported then a call to // OnRequestAccess() will always refuse access and a call to // OnSendData() will do nothing. - media::MIDIManager* const midi_manager_; + media::MidiManager* const midi_manager_; // Buffers where data sent from each MIDI input port is stored. - ScopedVector<media::MIDIMessageQueue> received_messages_queues_; + ScopedVector<media::MidiMessageQueue> received_messages_queues_; // The number of bytes sent to the platform-specific MIDI sending // system, but not yet completed. @@ -91,7 +91,7 @@ class CONTENT_EXPORT MIDIHost // Protects access to |sent_bytes_in_flight_|. base::Lock in_flight_lock_; - DISALLOW_COPY_AND_ASSIGN(MIDIHost); + DISALLOW_COPY_AND_ASSIGN(MidiHost); }; } // namespace content diff --git a/content/browser/renderer_host/media/midi_host_unittest.cc b/content/browser/renderer_host/media/midi_host_unittest.cc index fedb4265..fe365dd 100644 --- a/content/browser/renderer_host/media/midi_host_unittest.cc +++ b/content/browser/renderer_host/media/midi_host_unittest.cc @@ -41,22 +41,22 @@ void PushToVector(const T(&data)[N], std::vector<T>* buffer) { } // namespace -TEST(MIDIHostTest, IsValidWebMIDIData) { +TEST(MidiHostTest, IsValidWebMIDIData) { // Test single event scenario - EXPECT_TRUE(MIDIHost::IsValidWebMIDIData(AsVector(kGMOn))); - EXPECT_TRUE(MIDIHost::IsValidWebMIDIData(AsVector(kGSOn))); - EXPECT_TRUE(MIDIHost::IsValidWebMIDIData(AsVector(kNoteOn))); - EXPECT_TRUE(MIDIHost::IsValidWebMIDIData(AsVector(kChannelPressure))); - EXPECT_TRUE(MIDIHost::IsValidWebMIDIData(AsVector(kTimingClock))); - EXPECT_FALSE(MIDIHost::IsValidWebMIDIData(AsVector(kBrokenData1))); - EXPECT_FALSE(MIDIHost::IsValidWebMIDIData(AsVector(kBrokenData2))); - EXPECT_FALSE(MIDIHost::IsValidWebMIDIData(AsVector(kBrokenData3))); - EXPECT_FALSE(MIDIHost::IsValidWebMIDIData(AsVector(kDataByte0))); + EXPECT_TRUE(MidiHost::IsValidWebMIDIData(AsVector(kGMOn))); + EXPECT_TRUE(MidiHost::IsValidWebMIDIData(AsVector(kGSOn))); + EXPECT_TRUE(MidiHost::IsValidWebMIDIData(AsVector(kNoteOn))); + EXPECT_TRUE(MidiHost::IsValidWebMIDIData(AsVector(kChannelPressure))); + EXPECT_TRUE(MidiHost::IsValidWebMIDIData(AsVector(kTimingClock))); + EXPECT_FALSE(MidiHost::IsValidWebMIDIData(AsVector(kBrokenData1))); + EXPECT_FALSE(MidiHost::IsValidWebMIDIData(AsVector(kBrokenData2))); + EXPECT_FALSE(MidiHost::IsValidWebMIDIData(AsVector(kBrokenData3))); + EXPECT_FALSE(MidiHost::IsValidWebMIDIData(AsVector(kDataByte0))); // MIDI running status should be disallowed - EXPECT_FALSE(MIDIHost::IsValidWebMIDIData( + EXPECT_FALSE(MidiHost::IsValidWebMIDIData( AsVector(kNoteOnWithRunningStatus))); - EXPECT_FALSE(MIDIHost::IsValidWebMIDIData( + EXPECT_FALSE(MidiHost::IsValidWebMIDIData( AsVector(kChannelPressureWithRunningStatus))); // Multiple messages are allowed as long as each of them is complete. @@ -67,9 +67,9 @@ TEST(MIDIHostTest, IsValidWebMIDIData) { PushToVector(kGSOn, &buffer); PushToVector(kTimingClock, &buffer); PushToVector(kNoteOn, &buffer); - EXPECT_TRUE(MIDIHost::IsValidWebMIDIData(buffer)); + EXPECT_TRUE(MidiHost::IsValidWebMIDIData(buffer)); PushToVector(kBrokenData1, &buffer); - EXPECT_FALSE(MIDIHost::IsValidWebMIDIData(buffer)); + EXPECT_FALSE(MidiHost::IsValidWebMIDIData(buffer)); } // MIDI realtime message can be placed at any position. @@ -77,13 +77,14 @@ TEST(MIDIHostTest, IsValidWebMIDIData) { const uint8 kNoteOnWithRealTimeClock[] = { 0x90, 0xf8, 0x3c, 0x7f, 0x90, 0xf8, 0x3c, 0xf8, 0x7f, 0xf8, }; - EXPECT_TRUE(MIDIHost::IsValidWebMIDIData( + EXPECT_TRUE(MidiHost::IsValidWebMIDIData( AsVector(kNoteOnWithRealTimeClock))); const uint8 kGMOnWithRealTimeClock[] = { 0xf0, 0xf8, 0x7e, 0x7f, 0x09, 0x01, 0xf8, 0xf7, }; - EXPECT_TRUE(MIDIHost::IsValidWebMIDIData(AsVector(kGMOnWithRealTimeClock))); + EXPECT_TRUE(MidiHost::IsValidWebMIDIData( + AsVector(kGMOnWithRealTimeClock))); } } diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index f217c63..37bc3d1 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -654,8 +654,8 @@ void RenderProcessHostImpl::CreateMessageFilters() { media_stream_manager); AddFilter(audio_renderer_host_); AddFilter( - new MIDIHost(GetID(), BrowserMainLoop::GetInstance()->midi_manager())); - AddFilter(new MIDIDispatcherHost(GetID(), browser_context)); + new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_manager())); + AddFilter(new MidiDispatcherHost(GetID(), browser_context)); AddFilter(new VideoCaptureHost(media_stream_manager)); AddFilter(new AppCacheDispatcherHost( storage_partition_impl_->GetAppCacheService(), diff --git a/content/common/media/midi_messages.h b/content/common/media/midi_messages.h index eced85d..5a0fd7e 100644 --- a/content/common/media/midi_messages.h +++ b/content/common/media/midi_messages.h @@ -13,58 +13,58 @@ #undef IPC_MESSAGE_EXPORT #define IPC_MESSAGE_EXPORT CONTENT_EXPORT -#define IPC_MESSAGE_START MIDIMsgStart +#define IPC_MESSAGE_START MidiMsgStart -IPC_STRUCT_TRAITS_BEGIN(media::MIDIPortInfo) +IPC_STRUCT_TRAITS_BEGIN(media::MidiPortInfo) IPC_STRUCT_TRAITS_MEMBER(id) IPC_STRUCT_TRAITS_MEMBER(manufacturer) IPC_STRUCT_TRAITS_MEMBER(name) IPC_STRUCT_TRAITS_MEMBER(version) IPC_STRUCT_TRAITS_END() -// Messages for IPC between MIDIDispatcher and MIDIDispatcherHost. +// Messages for IPC between MidiDispatcher and MidiDispatcherHost. // Renderer request to browser for using system exclusive messages. -IPC_MESSAGE_CONTROL3(MIDIHostMsg_RequestSysExPermission, +IPC_MESSAGE_CONTROL3(MidiHostMsg_RequestSysExPermission, int /* routing id */, int /* client id */, GURL /* origin */) // Renderer request to browser for canceling a previous permission request. -IPC_MESSAGE_CONTROL3(MIDIHostMsg_CancelSysExPermissionRequest, +IPC_MESSAGE_CONTROL3(MidiHostMsg_CancelSysExPermissionRequest, int /* render_view_id */, int /* bridge_id */, GURL /* GURL of the frame */) // Messages sent from the browser to the renderer. -IPC_MESSAGE_ROUTED2(MIDIMsg_SysExPermissionApproved, +IPC_MESSAGE_ROUTED2(MidiMsg_SysExPermissionApproved, int /* client id */, bool /* success */) -// Messages for IPC between MIDIMessageFilter and MIDIHost. +// Messages for IPC between MidiMessageFilter and MidiHost. // Renderer request to browser for access to MIDI services. -IPC_MESSAGE_CONTROL1(MIDIHostMsg_StartSession, +IPC_MESSAGE_CONTROL1(MidiHostMsg_StartSession, int /* client id */) -IPC_MESSAGE_CONTROL3(MIDIHostMsg_SendData, +IPC_MESSAGE_CONTROL3(MidiHostMsg_SendData, uint32 /* port */, std::vector<uint8> /* data */, double /* timestamp */) // Messages sent from the browser to the renderer. -IPC_MESSAGE_CONTROL4(MIDIMsg_SessionStarted, +IPC_MESSAGE_CONTROL4(MidiMsg_SessionStarted, int /* client id */, bool /* success */, - media::MIDIPortInfoList /* input ports */, - media::MIDIPortInfoList /* output ports */) + media::MidiPortInfoList /* input ports */, + media::MidiPortInfoList /* output ports */) -IPC_MESSAGE_CONTROL3(MIDIMsg_DataReceived, +IPC_MESSAGE_CONTROL3(MidiMsg_DataReceived, uint32 /* port */, std::vector<uint8> /* data */, double /* timestamp */) -IPC_MESSAGE_CONTROL1(MIDIMsg_AcknowledgeSentData, +IPC_MESSAGE_CONTROL1(MidiMsg_AcknowledgeSentData, uint32 /* bytes sent */) diff --git a/content/public/browser/browser_context.h b/content/public/browser/browser_context.h index 527184f..c16a77d 100644 --- a/content/public/browser/browser_context.h +++ b/content/public/browser/browser_context.h @@ -125,19 +125,19 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData { const base::FilePath& partition_path, bool in_memory) = 0; - typedef base::Callback<void(bool)> MIDISysExPermissionCallback; + typedef base::Callback<void(bool)> MidiSysExPermissionCallback; // Requests a permission to use system exclusive messages in MIDI events. // |callback| will be invoked when the request is resolved. - virtual void RequestMIDISysExPermission( + virtual void RequestMidiSysExPermission( int render_process_id, int render_view_id, int bridge_id, const GURL& requesting_frame, - const MIDISysExPermissionCallback& callback) = 0; + const MidiSysExPermissionCallback& callback) = 0; // Cancels a pending MIDI permission request. - virtual void CancelMIDISysExPermissionRequest( + virtual void CancelMidiSysExPermissionRequest( int render_process_id, int render_view_id, int bridge_id, diff --git a/content/public/test/test_browser_context.cc b/content/public/test/test_browser_context.cc index 0be7d1b..a708c26 100644 --- a/content/public/test/test_browser_context.cc +++ b/content/public/test/test_browser_context.cc @@ -98,17 +98,17 @@ TestBrowserContext::GetMediaRequestContextForStoragePartition( return NULL; } -void TestBrowserContext::RequestMIDISysExPermission( +void TestBrowserContext::RequestMidiSysExPermission( int render_process_id, int render_view_id, int bridge_id, const GURL& requesting_frame, - const MIDISysExPermissionCallback& callback) { + const MidiSysExPermissionCallback& callback) { // Always reject requests for testing. callback.Run(false); } -void TestBrowserContext::CancelMIDISysExPermissionRequest( +void TestBrowserContext::CancelMidiSysExPermissionRequest( int render_process_id, int render_view_id, int bridge_id, diff --git a/content/public/test/test_browser_context.h b/content/public/test/test_browser_context.h index 4ede4f8..2c0021e 100644 --- a/content/public/test/test_browser_context.h +++ b/content/public/test/test_browser_context.h @@ -40,13 +40,13 @@ class TestBrowserContext : public BrowserContext { GetMediaRequestContextForStoragePartition( const base::FilePath& partition_path, bool in_memory) OVERRIDE; - virtual void RequestMIDISysExPermission( + virtual void RequestMidiSysExPermission( int render_process_id, int render_view_id, int bridge_id, const GURL& requesting_frame, - const MIDISysExPermissionCallback& callback) OVERRIDE; - virtual void CancelMIDISysExPermissionRequest( + const MidiSysExPermissionCallback& callback) OVERRIDE; + virtual void CancelMidiSysExPermissionRequest( int render_process_id, int render_view_id, int bridge_id, diff --git a/content/renderer/media/midi_dispatcher.cc b/content/renderer/media/midi_dispatcher.cc index 1f04e3e..a7c0679 100644 --- a/content/renderer/media/midi_dispatcher.cc +++ b/content/renderer/media/midi_dispatcher.cc @@ -16,32 +16,32 @@ using blink::WebSecurityOrigin; namespace content { -MIDIDispatcher::MIDIDispatcher(RenderViewImpl* render_view) +MidiDispatcher::MidiDispatcher(RenderViewImpl* render_view) : RenderViewObserver(render_view) { } -MIDIDispatcher::~MIDIDispatcher() {} +MidiDispatcher::~MidiDispatcher() {} -bool MIDIDispatcher::OnMessageReceived(const IPC::Message& message) { +bool MidiDispatcher::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP(MIDIDispatcher, message) - IPC_MESSAGE_HANDLER(MIDIMsg_SysExPermissionApproved, + IPC_BEGIN_MESSAGE_MAP(MidiDispatcher, message) + IPC_MESSAGE_HANDLER(MidiMsg_SysExPermissionApproved, OnSysExPermissionApproved) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; } -void MIDIDispatcher::requestSysExPermission( +void MidiDispatcher::requestSysExPermission( const WebMIDIPermissionRequest& request) { int bridge_id = requests_.Add(new WebMIDIPermissionRequest(request)); WebSecurityOrigin security_origin = request.securityOrigin(); std::string origin = security_origin.toString().utf8(); GURL url(origin); - Send(new MIDIHostMsg_RequestSysExPermission(routing_id(), bridge_id, url)); + Send(new MidiHostMsg_RequestSysExPermission(routing_id(), bridge_id, url)); } -void MIDIDispatcher::cancelSysExPermissionRequest( +void MidiDispatcher::cancelSysExPermissionRequest( const WebMIDIPermissionRequest& request) { for (IDMap<WebMIDIPermissionRequest>::iterator it(&requests_); !it.IsAtEnd(); @@ -49,7 +49,7 @@ void MIDIDispatcher::cancelSysExPermissionRequest( WebMIDIPermissionRequest* value = it.GetCurrentValue(); if (value->equals(request)) { base::string16 origin = request.securityOrigin().toString(); - Send(new MIDIHostMsg_CancelSysExPermissionRequest( + Send(new MidiHostMsg_CancelSysExPermissionRequest( routing_id(), it.GetCurrentKey(), GURL(origin))); requests_.Remove(it.GetCurrentKey()); break; @@ -57,7 +57,8 @@ void MIDIDispatcher::cancelSysExPermissionRequest( } } -void MIDIDispatcher::OnSysExPermissionApproved(int bridge_id, bool is_allowed) { +void MidiDispatcher::OnSysExPermissionApproved(int bridge_id, + bool is_allowed) { // |request| can be NULL when the request is canceled. WebMIDIPermissionRequest* request = requests_.Lookup(bridge_id); if (!request) diff --git a/content/renderer/media/midi_dispatcher.h b/content/renderer/media/midi_dispatcher.h index 70f8125..8c875aa 100644 --- a/content/renderer/media/midi_dispatcher.h +++ b/content/renderer/media/midi_dispatcher.h @@ -17,16 +17,16 @@ namespace content { class RenderViewImpl; -// MIDIDispatcher implements WebMIDIClient to handle permissions for using +// MidiDispatcher implements WebMIDIClient to handle permissions for using // system exclusive messages. // It works as RenderViewObserver to handle IPC messages between -// MIDIDispatcherHost owned by RenderViewHost since permissions are managed in +// MidiDispatcherHost owned by RenderViewHost since permissions are managed in // the browser process. -class MIDIDispatcher : public RenderViewObserver, +class MidiDispatcher : public RenderViewObserver, public blink::WebMIDIClient { public: - explicit MIDIDispatcher(RenderViewImpl* render_view); - virtual ~MIDIDispatcher(); + explicit MidiDispatcher(RenderViewImpl* render_view); + virtual ~MidiDispatcher(); private: // RenderView::Observer implementation. @@ -46,7 +46,7 @@ class MIDIDispatcher : public RenderViewObserver, // WebMIDIPermissionRequest::setIsAllowed(). IDMap<blink::WebMIDIPermissionRequest> requests_; - DISALLOW_COPY_AND_ASSIGN(MIDIDispatcher); + DISALLOW_COPY_AND_ASSIGN(MidiDispatcher); }; } // namespace content diff --git a/content/renderer/media/midi_message_filter.cc b/content/renderer/media/midi_message_filter.cc index 992c46e..f349c6e 100644 --- a/content/renderer/media/midi_message_filter.cc +++ b/content/renderer/media/midi_message_filter.cc @@ -12,7 +12,7 @@ #include "content/renderer/render_thread_impl.h" #include "ipc/ipc_logging.h" -using media::MIDIPortInfoList; +using media::MidiPortInfoList; using base::AutoLock; // The maximum number of bytes which we're allowed to send to the browser @@ -22,7 +22,7 @@ static const size_t kMaxUnacknowledgedBytesSent = 10 * 1024 * 1024; // 10 MB. namespace content { -MIDIMessageFilter::MIDIMessageFilter( +MidiMessageFilter::MidiMessageFilter( const scoped_refptr<base::MessageLoopProxy>& io_message_loop) : channel_(NULL), io_message_loop_(io_message_loop), @@ -31,9 +31,9 @@ MIDIMessageFilter::MIDIMessageFilter( unacknowledged_bytes_sent_(0) { } -MIDIMessageFilter::~MIDIMessageFilter() {} +MidiMessageFilter::~MidiMessageFilter() {} -void MIDIMessageFilter::Send(IPC::Message* message) { +void MidiMessageFilter::Send(IPC::Message* message) { DCHECK(io_message_loop_->BelongsToCurrentThread()); if (!channel_) { delete message; @@ -42,24 +42,24 @@ void MIDIMessageFilter::Send(IPC::Message* message) { } } -bool MIDIMessageFilter::OnMessageReceived(const IPC::Message& message) { +bool MidiMessageFilter::OnMessageReceived(const IPC::Message& message) { DCHECK(io_message_loop_->BelongsToCurrentThread()); bool handled = true; - IPC_BEGIN_MESSAGE_MAP(MIDIMessageFilter, message) - IPC_MESSAGE_HANDLER(MIDIMsg_SessionStarted, OnSessionStarted) - IPC_MESSAGE_HANDLER(MIDIMsg_DataReceived, OnDataReceived) - IPC_MESSAGE_HANDLER(MIDIMsg_AcknowledgeSentData, OnAcknowledgeSentData) + IPC_BEGIN_MESSAGE_MAP(MidiMessageFilter, message) + IPC_MESSAGE_HANDLER(MidiMsg_SessionStarted, OnSessionStarted) + IPC_MESSAGE_HANDLER(MidiMsg_DataReceived, OnDataReceived) + IPC_MESSAGE_HANDLER(MidiMsg_AcknowledgeSentData, OnAcknowledgeSentData) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; } -void MIDIMessageFilter::OnFilterAdded(IPC::Channel* channel) { +void MidiMessageFilter::OnFilterAdded(IPC::Channel* channel) { DCHECK(io_message_loop_->BelongsToCurrentThread()); channel_ = channel; } -void MIDIMessageFilter::OnFilterRemoved() { +void MidiMessageFilter::OnFilterRemoved() { DCHECK(io_message_loop_->BelongsToCurrentThread()); // Once removed, a filter will not be used again. At this time all @@ -67,12 +67,12 @@ void MIDIMessageFilter::OnFilterRemoved() { OnChannelClosing(); } -void MIDIMessageFilter::OnChannelClosing() { +void MidiMessageFilter::OnChannelClosing() { DCHECK(io_message_loop_->BelongsToCurrentThread()); channel_ = NULL; } -void MIDIMessageFilter::StartSession(blink::WebMIDIAccessorClient* client) { +void MidiMessageFilter::StartSession(blink::WebMIDIAccessorClient* client) { // Generate and keep track of a "client id" which is sent to the browser // to ask permission to talk to MIDI hardware. // This id is handed back when we receive the answer in OnAccessApproved(). @@ -81,16 +81,16 @@ void MIDIMessageFilter::StartSession(blink::WebMIDIAccessorClient* client) { clients_[client] = client_id; io_message_loop_->PostTask(FROM_HERE, - base::Bind(&MIDIMessageFilter::StartSessionOnIOThread, this, + base::Bind(&MidiMessageFilter::StartSessionOnIOThread, this, client_id)); } } -void MIDIMessageFilter::StartSessionOnIOThread(int client_id) { - Send(new MIDIHostMsg_StartSession(client_id)); +void MidiMessageFilter::StartSessionOnIOThread(int client_id) { + Send(new MidiHostMsg_StartSession(client_id)); } -void MIDIMessageFilter::RemoveClient(blink::WebMIDIAccessorClient* client) { +void MidiMessageFilter::RemoveClient(blink::WebMIDIAccessorClient* client) { ClientsMap::iterator i = clients_.find(client); if (i != clients_.end()) clients_.erase(i); @@ -98,23 +98,23 @@ void MIDIMessageFilter::RemoveClient(blink::WebMIDIAccessorClient* client) { // Received from browser. -void MIDIMessageFilter::OnSessionStarted( +void MidiMessageFilter::OnSessionStarted( int client_id, bool success, - MIDIPortInfoList inputs, - MIDIPortInfoList outputs) { + MidiPortInfoList inputs, + MidiPortInfoList outputs) { // Handle on the main JS thread. main_message_loop_->PostTask( FROM_HERE, - base::Bind(&MIDIMessageFilter::HandleSessionStarted, this, + base::Bind(&MidiMessageFilter::HandleSessionStarted, this, client_id, success, inputs, outputs)); } -void MIDIMessageFilter::HandleSessionStarted( +void MidiMessageFilter::HandleSessionStarted( int client_id, bool success, - MIDIPortInfoList inputs, - MIDIPortInfoList outputs) { + MidiPortInfoList inputs, + MidiPortInfoList outputs) { blink::WebMIDIAccessorClient* client = GetClientFromId(client_id); if (!client) return; @@ -141,7 +141,7 @@ void MIDIMessageFilter::HandleSessionStarted( } blink::WebMIDIAccessorClient* -MIDIMessageFilter::GetClientFromId(int client_id) { +MidiMessageFilter::GetClientFromId(int client_id) { // Iterating like this seems inefficient, but in practice there generally // will be very few clients (usually one). Additionally, this lookup // usually happens one time during page load. So the performance hit is @@ -153,57 +153,57 @@ MIDIMessageFilter::GetClientFromId(int client_id) { return NULL; } -void MIDIMessageFilter::OnDataReceived(uint32 port, +void MidiMessageFilter::OnDataReceived(uint32 port, const std::vector<uint8>& data, double timestamp) { - TRACE_EVENT0("midi", "MIDIMessageFilter::OnDataReceived"); + TRACE_EVENT0("midi", "MidiMessageFilter::OnDataReceived"); main_message_loop_->PostTask( FROM_HERE, - base::Bind(&MIDIMessageFilter::HandleDataReceived, this, + base::Bind(&MidiMessageFilter::HandleDataReceived, this, port, data, timestamp)); } -void MIDIMessageFilter::OnAcknowledgeSentData(size_t bytes_sent) { +void MidiMessageFilter::OnAcknowledgeSentData(size_t bytes_sent) { DCHECK_GE(unacknowledged_bytes_sent_, bytes_sent); if (unacknowledged_bytes_sent_ >= bytes_sent) unacknowledged_bytes_sent_ -= bytes_sent; } -void MIDIMessageFilter::HandleDataReceived(uint32 port, +void MidiMessageFilter::HandleDataReceived(uint32 port, const std::vector<uint8>& data, double timestamp) { DCHECK(!data.empty()); - TRACE_EVENT0("midi", "MIDIMessageFilter::HandleDataReceived"); + TRACE_EVENT0("midi", "MidiMessageFilter::HandleDataReceived"); for (ClientsMap::iterator i = clients_.begin(); i != clients_.end(); ++i) (*i).first->didReceiveMIDIData(port, &data[0], data.size(), timestamp); } -void MIDIMessageFilter::SendMIDIData(uint32 port, +void MidiMessageFilter::SendMidiData(uint32 port, const uint8* data, size_t length, double timestamp) { if (length > kMaxUnacknowledgedBytesSent) { - // TODO(crogers): buffer up the data to send at a later time. + // TODO(toyoshim): buffer up the data to send at a later time. // For now we're just dropping these bytes on the floor. return; } std::vector<uint8> v(data, data + length); io_message_loop_->PostTask(FROM_HERE, - base::Bind(&MIDIMessageFilter::SendMIDIDataOnIOThread, this, + base::Bind(&MidiMessageFilter::SendMidiDataOnIOThread, this, port, v, timestamp)); } -void MIDIMessageFilter::SendMIDIDataOnIOThread(uint32 port, +void MidiMessageFilter::SendMidiDataOnIOThread(uint32 port, const std::vector<uint8>& data, double timestamp) { size_t n = data.size(); if (n > kMaxUnacknowledgedBytesSent || unacknowledged_bytes_sent_ > kMaxUnacknowledgedBytesSent || n + unacknowledged_bytes_sent_ > kMaxUnacknowledgedBytesSent) { - // TODO(crogers): buffer up the data to send at a later time. + // TODO(toyoshim): buffer up the data to send at a later time. // For now we're just dropping these bytes on the floor. return; } @@ -211,7 +211,7 @@ void MIDIMessageFilter::SendMIDIDataOnIOThread(uint32 port, unacknowledged_bytes_sent_ += n; // Send to the browser. - Send(new MIDIHostMsg_SendData(port, data, timestamp)); + Send(new MidiHostMsg_SendData(port, data, timestamp)); } } // namespace content diff --git a/content/renderer/media/midi_message_filter.h b/content/renderer/media/midi_message_filter.h index c2e66ae..c7a4441 100644 --- a/content/renderer/media/midi_message_filter.h +++ b/content/renderer/media/midi_message_filter.h @@ -21,10 +21,10 @@ class MessageLoopProxy; namespace content { // MessageFilter that handles MIDI messages. -class CONTENT_EXPORT MIDIMessageFilter +class CONTENT_EXPORT MidiMessageFilter : public IPC::ChannelProxy::MessageFilter { public: - explicit MIDIMessageFilter( + explicit MidiMessageFilter( const scoped_refptr<base::MessageLoopProxy>& io_message_loop); // Each client registers for MIDI access here. @@ -36,7 +36,7 @@ class CONTENT_EXPORT MIDIMessageFilter // A client will only be able to call this method if it has a suitable // output port (from addOutputPort()). - void SendMIDIData(uint32 port, + void SendMidiData(uint32 port, const uint8* data, size_t length, double timestamp); @@ -47,7 +47,7 @@ class CONTENT_EXPORT MIDIMessageFilter } protected: - virtual ~MIDIMessageFilter(); + virtual ~MidiMessageFilter(); private: // Sends an IPC message using |channel_|. @@ -63,8 +63,8 @@ class CONTENT_EXPORT MIDIMessageFilter // MIDI hardware. void OnSessionStarted(int client_id, bool success, - media::MIDIPortInfoList inputs, - media::MIDIPortInfoList outputs); + media::MidiPortInfoList inputs, + media::MidiPortInfoList outputs); // Called when the browser process has sent MIDI data containing one or // more messages. @@ -79,8 +79,8 @@ class CONTENT_EXPORT MIDIMessageFilter void HandleSessionStarted(int client_id, bool success, - media::MIDIPortInfoList inputs, - media::MIDIPortInfoList outputs); + media::MidiPortInfoList inputs, + media::MidiPortInfoList outputs); void HandleDataReceived(uint32 port, const std::vector<uint8>& data, @@ -88,7 +88,7 @@ class CONTENT_EXPORT MIDIMessageFilter void StartSessionOnIOThread(int client_id); - void SendMIDIDataOnIOThread(uint32 port, + void SendMidiDataOnIOThread(uint32 port, const std::vector<uint8>& data, double timestamp); @@ -115,7 +115,7 @@ class CONTENT_EXPORT MIDIMessageFilter size_t unacknowledged_bytes_sent_; - DISALLOW_COPY_AND_ASSIGN(MIDIMessageFilter); + DISALLOW_COPY_AND_ASSIGN(MidiMessageFilter); }; } // namespace content diff --git a/content/renderer/media/renderer_webmidiaccessor_impl.cc b/content/renderer/media/renderer_webmidiaccessor_impl.cc index b121746..75b6b972 100644 --- a/content/renderer/media/renderer_webmidiaccessor_impl.cc +++ b/content/renderer/media/renderer_webmidiaccessor_impl.cc @@ -29,14 +29,14 @@ void RendererWebMIDIAccessorImpl::sendMIDIData( const unsigned char* data, size_t length, double timestamp) { - midi_message_filter()->SendMIDIData( + midi_message_filter()->SendMidiData( port_index, data, length, timestamp); } -MIDIMessageFilter* RendererWebMIDIAccessorImpl::midi_message_filter() { +MidiMessageFilter* RendererWebMIDIAccessorImpl::midi_message_filter() { return RenderThreadImpl::current()->midi_message_filter(); } diff --git a/content/renderer/media/renderer_webmidiaccessor_impl.h b/content/renderer/media/renderer_webmidiaccessor_impl.h index 4ebaffd..791c294 100644 --- a/content/renderer/media/renderer_webmidiaccessor_impl.h +++ b/content/renderer/media/renderer_webmidiaccessor_impl.h @@ -12,7 +12,7 @@ namespace content { -class MIDIMessageFilter; +class MidiMessageFilter; class RendererWebMIDIAccessorImpl : public blink::WebMIDIAccessor { @@ -31,7 +31,7 @@ class RendererWebMIDIAccessorImpl private: blink::WebMIDIAccessorClient* client_; - MIDIMessageFilter* midi_message_filter(); + MidiMessageFilter* midi_message_filter(); DISALLOW_COPY_AND_ASSIGN(RendererWebMIDIAccessorImpl); }; diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 8bcd62d..026b128 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -371,7 +371,7 @@ void RenderThreadImpl::Init() { audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); AddFilter(audio_message_filter_.get()); - midi_message_filter_ = new MIDIMessageFilter(GetIOMessageLoopProxy()); + midi_message_filter_ = new MidiMessageFilter(GetIOMessageLoopProxy()); AddFilter(midi_message_filter_.get()); AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index c05d775..08f1663 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -85,7 +85,7 @@ class InputEventFilter; class InputHandlerManager; class MediaStreamCenter; class MediaStreamDependencyFactory; -class MIDIMessageFilter; +class MidiMessageFilter; class P2PSocketDispatcher; class PeerConnectionTracker; class RendererDemuxerAndroid; @@ -214,7 +214,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, return audio_message_filter_.get(); } - MIDIMessageFilter* midi_message_filter() { + MidiMessageFilter* midi_message_filter() { return midi_message_filter_.get(); } @@ -416,7 +416,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, scoped_refptr<DBMessageFilter> db_message_filter_; scoped_refptr<AudioInputMessageFilter> audio_input_message_filter_; scoped_refptr<AudioMessageFilter> audio_message_filter_; - scoped_refptr<MIDIMessageFilter> midi_message_filter_; + scoped_refptr<MidiMessageFilter> midi_message_filter_; #if defined(OS_ANDROID) scoped_refptr<RendererDemuxerAndroid> renderer_demuxer_; #endif diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 5d3a5cd..6b49253 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -5745,7 +5745,7 @@ blink::WebUserMediaClient* RenderViewImpl::userMediaClient() { blink::WebMIDIClient* RenderViewImpl::webMIDIClient() { if (!midi_dispatcher_) - midi_dispatcher_ = new MIDIDispatcher(this); + midi_dispatcher_ = new MidiDispatcher(this); return midi_dispatcher_; } diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index a95d468..7333424 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -147,7 +147,7 @@ class ImageResourceFetcher; class InputTagSpeechDispatcher; class JavaBridgeDispatcher; class LoadProgressTracker; -class MIDIDispatcher; +class MidiDispatcher; class MediaStreamClient; class MediaStreamDispatcher; class MouseLockDispatcher; @@ -1339,8 +1339,8 @@ class CONTENT_EXPORT RenderViewImpl MediaStreamClient* media_stream_client_; blink::WebUserMediaClient* web_user_media_client_; - // MIDIClient attached to this view; lazily initialized. - MIDIDispatcher* midi_dispatcher_; + // MidiClient attached to this view; lazily initialized. + MidiDispatcher* midi_dispatcher_; DevToolsAgent* devtools_agent_; diff --git a/content/shell/browser/shell_browser_context.cc b/content/shell/browser/shell_browser_context.cc index 086af38..5eb71e5 100644 --- a/content/shell/browser/shell_browser_context.cc +++ b/content/shell/browser/shell_browser_context.cc @@ -176,22 +176,23 @@ net::URLRequestContextGetter* return GetRequestContext(); } -void ShellBrowserContext::RequestMIDISysExPermission( +void ShellBrowserContext::RequestMidiSysExPermission( int render_process_id, int render_view_id, int bridge_id, const GURL& requesting_frame, - const MIDISysExPermissionCallback& callback) { + const MidiSysExPermissionCallback& callback) { // Always reject requests for LayoutTests for now. // TODO(toyoshim): Make it programmable to improve test coverage. - if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { + if (!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDumpRenderTree)) { callback.Run(false); return; } callback.Run(true); } -void ShellBrowserContext::CancelMIDISysExPermissionRequest( +void ShellBrowserContext::CancelMidiSysExPermissionRequest( int render_process_id, int render_view_id, int bridge_id, diff --git a/content/shell/browser/shell_browser_context.h b/content/shell/browser/shell_browser_context.h index f6254a0..d4c78d4 100644 --- a/content/shell/browser/shell_browser_context.h +++ b/content/shell/browser/shell_browser_context.h @@ -43,13 +43,13 @@ class ShellBrowserContext : public BrowserContext { GetMediaRequestContextForStoragePartition( const base::FilePath& partition_path, bool in_memory) OVERRIDE; - virtual void RequestMIDISysExPermission( + virtual void RequestMidiSysExPermission( int render_process_id, int render_view_id, int bridge_id, const GURL& requesting_frame, - const MIDISysExPermissionCallback& callback) OVERRIDE; - virtual void CancelMIDISysExPermissionRequest( + const MidiSysExPermissionCallback& callback) OVERRIDE; + virtual void CancelMidiSysExPermissionRequest( int render_process_id, int render_view_id, int bridge_id, |