Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/media/android/renderer_media_session_manager.h" | 5 #include "content/renderer/media/android/renderer_media_session_manager.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "content/common/media/media_session_messages_android.h" | |
| 9 #include "content/public/renderer/render_thread.h" | |
| 8 #include "content/renderer/media/android/webmediasession_android.h" | 10 #include "content/renderer/media/android/webmediasession_android.h" |
| 9 | 11 |
| 10 namespace content { | 12 namespace content { |
| 11 | 13 |
| 12 static const int kDefaultMediaSessionID = 0; | 14 static const int kDefaultMediaSessionID = 0; |
| 13 | 15 |
| 14 RendererMediaSessionManager::RendererMediaSessionManager( | 16 RendererMediaSessionManager::RendererMediaSessionManager( |
| 15 RenderFrame* render_frame) | 17 RenderFrame* render_frame) |
| 16 : RenderFrameObserver(render_frame), | 18 : RenderFrameObserver(render_frame), |
| 17 next_session_id_(kDefaultMediaSessionID + 1) {} | 19 next_session_id_(kDefaultMediaSessionID + 1) {} |
| 18 | 20 |
| 19 RendererMediaSessionManager::~RendererMediaSessionManager() { | 21 RendererMediaSessionManager::~RendererMediaSessionManager() { |
| 20 DCHECK(sessions_.empty()) | 22 DCHECK(sessions_.empty()) |
| 21 << "RendererMediaSessionManager is owned by RenderFrameImpl and is " | 23 << "RendererMediaSessionManager is owned by RenderFrameImpl and is " |
| 22 "destroyed only after all media sessions are destroyed."; | 24 "destroyed only after all media sessions are destroyed."; |
| 23 } | 25 } |
| 24 | 26 |
| 27 bool RendererMediaSessionManager::OnMessageReceived(const IPC::Message& msg) { | |
| 28 bool handled = true; | |
| 29 IPC_BEGIN_MESSAGE_MAP(RendererMediaSessionManager, msg) | |
| 30 IPC_MESSAGE_HANDLER(MediaSessionMsg_DidActivate, OnDidActivate) | |
| 31 IPC_MESSAGE_HANDLER(MediaSessionMsg_DidDeactivate, OnDidDeactivate) | |
| 32 IPC_MESSAGE_UNHANDLED(handled = false) | |
| 33 IPC_END_MESSAGE_MAP() | |
| 34 return handled; | |
| 35 } | |
| 36 | |
| 25 int RendererMediaSessionManager::RegisterMediaSession( | 37 int RendererMediaSessionManager::RegisterMediaSession( |
| 26 WebMediaSessionAndroid* session) { | 38 WebMediaSessionAndroid* session) { |
| 27 sessions_[next_session_id_] = session; | 39 sessions_[next_session_id_] = session; |
| 28 return next_session_id_++; | 40 return next_session_id_++; |
| 29 } | 41 } |
| 30 | 42 |
| 31 void RendererMediaSessionManager::UnregisterMediaSession(int session_id) { | 43 void RendererMediaSessionManager::UnregisterMediaSession(int session_id) { |
| 32 sessions_.erase(session_id); | 44 sessions_.erase(session_id); |
| 33 } | 45 } |
| 34 | 46 |
| 47 void RendererMediaSessionManager::Activate(int session_id, int request_id) { | |
| 48 Send(new MediaSessionHostMsg_Activate(routing_id(), session_id, request_id)); | |
| 49 } | |
| 50 | |
| 51 void RendererMediaSessionManager::Deactivate(int session_id, int request_id) { | |
| 52 Send( | |
| 53 new MediaSessionHostMsg_Deactivate(routing_id(), session_id, request_id)); | |
| 54 } | |
| 55 | |
| 56 void RendererMediaSessionManager::OnDidActivate(int session_id, | |
| 57 int request_id, | |
| 58 bool success) { | |
| 59 std::map<int, WebMediaSessionAndroid*>::iterator iter = | |
| 60 sessions_.find(session_id); | |
| 61 | |
| 62 if (iter == sessions_.end()) | |
| 63 return; | |
|
mlamouri (slow - plz ping)
2015/12/07 18:14:52
Is that expected? Should we DCHECK?
davve
2015/12/09 11:20:18
The equivalent DCHECKS added in ps#11. I removed t
| |
| 64 | |
| 65 iter->second->OnDidActivate(request_id, success); | |
| 66 } | |
| 67 | |
| 68 void RendererMediaSessionManager::OnDidDeactivate(int session_id, | |
| 69 int request_id) { | |
| 70 std::map<int, WebMediaSessionAndroid*>::iterator iter = | |
| 71 sessions_.find(session_id); | |
| 72 | |
| 73 if (iter == sessions_.end()) | |
| 74 return; | |
|
mlamouri (slow - plz ping)
2015/12/07 18:14:52
ditto.
| |
| 75 | |
| 76 iter->second->OnDidDeactivate(request_id); | |
| 77 } | |
| 78 | |
| 35 } // namespace content | 79 } // namespace content |
| OLD | NEW |